Merge branch 'master' into s3-aws-multipart

2014-11-03 16:05:03 -04:00 · 2014-11-03 16:05:03 -04:00 · a3ec6ed73b
commit a3ec6ed73b
parent 8faeb25076 bf57edbdd6
62 changed files with 1004 additions and 79 deletions
--- a/Remote/GCrypt.hs
+++ b/Remote/GCrypt.hs
@ -202,7 +202,7 @@ gCryptSetup mu _ c = go $ M.lookup "gitrepo" c
 						method <- setupRepo gcryptid =<< inRepo (Git.Construct.fromRemoteLocation gitrepo)
 						gitConfigSpecialRemote u c' "gcrypt" (fromAccessMethod method)
 						return (c', u)
-					else error $ "uuid mismatch " ++ show (u, mu, gcryptid)
+					else error $ "uuid mismatch; expected " ++ show mu ++ " but remote gitrepo has " ++ show u ++ " (" ++ show gcryptid ++ ")"

 {- Sets up the gcrypt repository. The repository is either a local
 - repo, or it is accessed via rsync directly, or it is accessed over ssh