summaryrefslogtreecommitdiff
path: root/Command/ReKey.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Command/ReKey.hs')
-rw-r--r--Command/ReKey.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/ReKey.hs b/Command/ReKey.hs
index 4d2039530..51f9f6fe1 100644
--- a/Command/ReKey.hs
+++ b/Command/ReKey.hs
@@ -33,7 +33,7 @@ seek = withPairs start
start :: (FilePath, String) -> CommandStart
start (file, keyname) = ifAnnexed file go stop
where
- newkey = fromMaybe (error "bad key") $ file2key keyname
+ newkey = fromMaybe (giveup "bad key") $ file2key keyname
go oldkey
| oldkey == newkey = stop
| otherwise = do
@@ -46,7 +46,7 @@ perform file oldkey newkey = do
( unlessM (linkKey file oldkey newkey) $
error "failed"
, unlessM (Annex.getState Annex.force) $
- error $ file ++ " is not available (use --force to override)"
+ giveup $ file ++ " is not available (use --force to override)"
)
next $ cleanup file oldkey newkey