diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-06-11 10:34:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-06-11 10:34:55 -0400 |
| commit | 97aab7e5b8f8a86d6d05c1687ccde404518e24f4 (patch) | |
| tree | 6a05ffb518fcd92e2a5fb08dae0706a866a8d7c6 /Remote | |
| parent | a23a6b3c4f6c86e470b6bb3115fb8029e4d9f761 (diff) | |
| parent | 928689e2c8fd6f670adafee3b46915146d108ce1 (diff) | |
Merge branch 'glacier'
Conflicts:
debian/changelog
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Glacier.hs | 4 |
1 files changed, 1 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 |