summaryrefslogtreecommitdiff
path: root/Config/Files.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-11-17 12:56:27 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-11-17 12:56:27 -0400
commit3a6c9ad7d00c6795faefcacbc42dc57d26aecd61 (patch)
treea03564275f6a9532fe487353c04b1c0cf7659a0d /Config/Files.hs
parenta5584e1a61861dff0835f7ea4e366e393c0fd294 (diff)
parent2286c5acb4b3917a71067264cc1075638848d340 (diff)
Merge branch 'master' into tor
Diffstat (limited to 'Config/Files.hs')
-rw-r--r--Config/Files.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Config/Files.hs b/Config/Files.hs
index 8f8b4c115..b18d912e9 100644
--- a/Config/Files.hs
+++ b/Config/Files.hs
@@ -80,4 +80,4 @@ readProgramFile = do
cannotFindProgram :: IO a
cannotFindProgram = do
f <- programFile
- error $ "cannot find git-annex program in PATH or in the location listed in " ++ f
+ giveup $ "cannot find git-annex program in PATH or in the location listed in " ++ f