mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages1 Wiki Activity Actions

avoid running background transferinfo when ssh connection caching is not supported

Browse source
This commit is contained in:
Joey Hess 2013-05-14 13:51:14 -04:00
parent 03a0f17fbb
commit 40a9d8e097
1 changed files with 6 additions and 1 deletions

7
Remote/Git.hs
View file

@ -308,6 +308,8 @@ copyFromRemote' r key file dest
- git-annex-shell transferinfo at the same time - git-annex-shell transferinfo at the same time
- git-annex-shell sendkey is running. - git-annex-shell sendkey is running.
- -
- To avoid extra password prompts, this is only done when ssh
- connection caching is supported.
- Note that it actually waits for rsync to indicate - Note that it actually waits for rsync to indicate
- progress before starting transferinfo, in order - progress before starting transferinfo, in order
- to ensure ssh connection caching works and reuses - to ensure ssh connection caching works and reuses
@ -316,7 +318,10 @@ copyFromRemote' r key file dest
- Also note that older git-annex-shell does not support - Also note that older git-annex-shell does not support
- transferinfo, so stderr is dropped and failure ignored. - transferinfo, so stderr is dropped and failure ignored.
-} -}
feedprogressback a = do feedprogressback a = ifM (isJust <$> sshCacheDir)
( feedprogressback' a
, bracketIO noop (const noop) $ a const
feedprogressback' a = do
u <- getUUID u <- getUUID
let fields = (Fields.remoteUUID, fromUUID u) let fields = (Fields.remoteUUID, fromUUID u)
: maybe [] (\f -> [(Fields.associatedFile, f)]) file : maybe [] (\f -> [(Fields.associatedFile, f)]) file