From 69ab9701ebc3e26f638c909989e0623cbe37d8dc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 10 Mar 2013 17:54:27 -0400 Subject: [PATCH] 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. --- Remote/Git.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Remote/Git.hs b/Remote/Git.hs index d39e0afe26..0d7d2a9885 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 $