diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-12 15:50:03 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-12 15:53:38 -0400 |
| commit | 7ca8bf3321d1b62ea4e817e28914ed2fa56afe30 (patch) | |
| tree | 2d176cb156c749348d4805af31309a25bdc9f897 /Remote/Git.hs | |
| parent | b94eafec8c4a7868da753f9b22ca823552e9764c (diff) | |
Avoid accumulating transfer failure log files unless the assistant is being used.
Only the assistant uses these, and only the assistant cleans them up, so
make only git annex transferkeys write them,
There is one behavior change from this. If glacier is being used, and a
manual git annex get --from glacier fails because the file isn't available
yet, the assistant will no longer later see that failed transfer file and
retry the get. Hope no-one depended on that old behavior.
Diffstat (limited to 'Remote/Git.hs')
| -rw-r--r-- | Remote/Git.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 170c6fbf6..5ac79df6d 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -386,7 +386,7 @@ copyFromRemote' r key file dest meterupdate let go = copier #endif runTransfer (Transfer Download u key) - file noRetry go + file noRetry noObserver go <&&> checksuccess | Git.repoIsSsh (repo r) = feedprogressback $ \feeder -> do direct <- isDirect @@ -502,7 +502,7 @@ copyToRemote' r key file p ( return True , do ensureInitialized - runTransfer (Transfer Download u key) file noRetry $ const $ + runTransfer (Transfer Download u key) file noRetry noObserver $ const $ Annex.Content.saveState True `after` Annex.Content.getViaTmpChecked (liftIO checksuccessio) key (\d -> rsyncOrCopyFile params object d p) |