summaryrefslogtreecommitdiff
path: root/Command/GCryptSetup.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Command/GCryptSetup.hs')
-rw-r--r--Command/GCryptSetup.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Command/GCryptSetup.hs b/Command/GCryptSetup.hs
index f2943ea13..cbc2de0ef 100644
--- a/Command/GCryptSetup.hs
+++ b/Command/GCryptSetup.hs
@@ -25,7 +25,7 @@ start :: String -> CommandStart
start gcryptid = next $ next $ do
u <- getUUID
when (u /= NoUUID) $
- error "gcryptsetup refusing to run; this repository already has a git-annex uuid!"
+ giveup "gcryptsetup refusing to run; this repository already has a git-annex uuid!"
g <- gitRepo
gu <- Remote.GCrypt.getGCryptUUID True g
@@ -35,5 +35,5 @@ start gcryptid = next $ next $ do
then do
void $ Remote.GCrypt.setupRepo gcryptid g
return True
- else error "cannot use gcrypt in a non-bare repository"
- else error "gcryptsetup uuid mismatch"
+ else giveup "cannot use gcrypt in a non-bare repository"
+ else giveup "gcryptsetup uuid mismatch"