diff options
| -rw-r--r-- | Remote/Glacier.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs index 65c978bd4..c1a53347d 100644 --- a/Remote/Glacier.hs +++ b/Remote/Glacier.hs @@ -195,14 +195,12 @@ checkPresent r k = do , Param $ archive r k ] - untrusted = do - showLongNote $ unlines + untrusted = return $ Left $ unlines [ "Glacier's inventory says it has a copy." , "However, the inventory could be out of date, if it was recently removed." , "(Use --trust-glacier if you're sure it's still in Glacier.)" , "" ] - return $ Right False glacierAction :: Remote -> [CommandParam] -> Annex Bool glacierAction r params = runGlacier (config r) (uuid r) params diff --git a/debian/changelog b/debian/changelog index 2c40b472d..3d617f089 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ git-annex (4.20130522) UNRELEASED; urgency=low * XMPP: Fix a file descriptor leak. * Android: Added an "Open WebApp" item to the terminal's menu. Should work for Android devices that cannot auto-open the webapp on start. + * glacier: Better handling of the glacier inventory, which avoids + duplicate uploads to the same glacier repository by `git annex copy`. -- Joey Hess <joeyh@debian.org> Tue, 21 May 2013 18:22:46 -0400 |