make programPath return FilePath not Maybe FilePath

Looking at the few current callers, it's ok to have programPath throw an
exception, in the unusual case where it cannot find git-annex.

1 files changed, 6 insertions, 1 deletions

diff --git a/Config/Files.hs b/Config/Files.hs
index b503a5443..d2b2f6a51 100644
--- a/Config/Files.hs
+++ b/Config/Files.hs
@@ -62,8 +62,13 @@ readProgramFile = do
 		( return p
 		, ifM (inPath cmd)
 			( return cmd
-			, error $ "cannot find git-annex program in PATH or in the location listed in " ++ programfile
+			, cannotFindProgram
 			)
 		)
   where
 	cmd = "git-annex"
+
+cannotFindProgram :: IO a
+cannotFindProgram = do
+	f <- programFile
+	error $ "cannot find git-annex program in PATH or in the location listed in " ++ f