diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-03-10 17:54:27 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-03-10 17:54:27 -0400 |
| commit | 5335b4edc67513354c723d51d4f9a7a99cf144c4 (patch) | |
| tree | b39bd41363a1d1cd995c1df9e630afeca4cb1d6d /Remote | |
| parent | e4fd84ea2cd2dda27306ade7ced75f0a1dc53cbe (diff) | |
copyToRemote should return True when the remote already has the key
This got broken in commit e9238e958877dff9d12a5a0ed396e93931de95ce.
I observed a key that had been copied to a remote, but the location
log was out of date, and due to this bug, git annex transferkey failed
and so the file could not be dropped when it was moved to an archive
directory.
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Git.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index d39e0afe2..0d7d2a988 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -355,7 +355,7 @@ copyToRemote r key file p u <- getUUID -- run copy from perspective of remote liftIO $ onLocal (repo r) $ ifM (Annex.Content.inAnnex key) - ( return False + ( return True , do ensureInitialized download u key file noRetry $ |