diff options
| -rw-r--r-- | Command/Drop.hs | 6 | ||||
| -rw-r--r-- | Command/Fsck.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/Command/Drop.hs b/Command/Drop.hs index 5699175ed..1d09ca3fd 100644 --- a/Command/Drop.hs +++ b/Command/Drop.hs @@ -89,10 +89,8 @@ cleanupLocal key = do cleanupRemote :: Key -> Remote -> Bool -> CommandCleanup cleanupRemote key remote ok = do - -- better safe than sorry: assume the remote dropped the key - -- even if it seemed to fail; the failure could have occurred - -- after it really dropped it - Remote.logStatus remote key InfoMissing + when ok $ + Remote.logStatus remote key InfoMissing return ok {- Checks specified remotes to verify that enough copies of a key exist to diff --git a/Command/Fsck.hs b/Command/Fsck.hs index a27588482..aeed58cd1 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -401,10 +401,8 @@ badContentDirect file key = do badContentRemote :: Remote -> Key -> Annex String badContentRemote remote key = do ok <- Remote.removeKey remote key - -- better safe than sorry: assume the remote dropped the key - -- even if it seemed to fail; the failure could have occurred - -- after it really dropped it - Remote.logStatus remote key InfoMissing + when ok $ + Remote.logStatus remote key InfoMissing return $ (if ok then "dropped from " else "failed to drop from ") ++ Remote.name remote diff --git a/debian/changelog b/debian/changelog index 75299cf39..31cc06000 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,8 @@ git-annex (4.20130228) UNRELEASED; urgency=low that caused regular browsers to stall when they reuse a connection after leaving it idle for 30 seconds. (See https://github.com/yesodweb/wai/issues/146) + * bugfix: drop --from an unavailable remote no longer updates the location + log, incorrectly, to say the remote does not have the key. -- Joey Hess <joeyh@debian.org> Wed, 27 Feb 2013 23:20:40 -0400 |