two more breakages introduced when removing the Params constructor

2 files changed, 9 insertions, 3 deletions

diff --git a/Test.hs b/Test.hs
index 85c9de9a6..607e41d09 100644
--- a/Test.hs
+++ b/Test.hs
@@ -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