diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-06-03 13:02:33 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-06-03 13:02:33 -0400 |
commit | 2ec66372940a29de91e3650651362ae862120ea4 (patch) | |
tree | 8e7255100c98c7806356827a1e01d4dd706e3833 | |
parent | f0e8f359fe793aa4922ba393676fe8a3db869d22 (diff) |
two more breakages introduced when removing the Params constructor
-rw-r--r-- | Test.hs | 10 | ||||
-rw-r--r-- | Utility/Gpg.hs | 2 |
2 files changed, 9 insertions, 3 deletions
@@ -1478,8 +1478,14 @@ clonerepo :: FilePath -> FilePath -> Bool -> IO FilePath clonerepo old new bare = do cleanup new ensuretmpdir - let b = if bare then " --bare" else "" - boolSystem "git" [Param "clone", Param "-q", Param b, File old, File new] @? "git clone failed" + let cloneparams = catMaybes + [ Just $ Param "clone" + , Just $ Param "-q" + , if bare then Just (Param "--bare") else Nothing + , Just $ File old + , Just $ File new + ] + boolSystem "git" cloneparams @? "git clone failed" configrepo new indir new $ git_annex "init" ["-q", new] @? "git annex init failed" diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs index 0a0b04a03..3e3a58013 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -339,7 +339,7 @@ testHarness a = do dir <- mktmpdir $ base </> "gpgtmpXXXXXX" setEnv var dir True -- For some reason, recent gpg needs a trustdb to be set up. - _ <- pipeStrict [Param "--trust-model auto", Param "--update-trustdb"] [] + _ <- pipeStrict [Param "--trust-model", Param "auto", Param "--update-trustdb"] [] _ <- pipeStrict [Param "--import", Param "-q"] $ unlines [testSecretKey, testKey] return dir |