mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

two more breakages introduced when removing the Params constructor

Browse source
This commit is contained in:
Joey Hess 2015-06-03 13:02:33 -04:00
parent 6186e96687
commit b8f044660f
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Test.hs
View file

@ -1478,8 +1478,14 @@ clonerepo :: FilePath -> FilePath -> Bool -> IO FilePath
clonerepo old new bare = do clonerepo old new bare = do
cleanup new cleanup new
ensuretmpdir ensuretmpdir
let b = if bare then " --bare" else "" let cloneparams = catMaybes
boolSystem "git" [Param "clone", Param "-q", Param b, File old, File new] @? "git clone failed" [ 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 configrepo new
indir new $ indir new $
git_annex "init" ["-q", new] @? "git annex init failed" git_annex "init" ["-q", new] @? "git annex init failed"

2
Utility/Gpg.hs
View file

@ -339,7 +339,7 @@ testHarness a = do
dir <- mktmpdir $ base </> "gpgtmpXXXXXX" dir <- mktmpdir $ base </> "gpgtmpXXXXXX"
setEnv var dir True setEnv var dir True
-- For some reason, recent gpg needs a trustdb to be set up. -- 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 _ <- pipeStrict [Param "--import", Param "-q"] $ unlines
[testSecretKey, testKey] [testSecretKey, testKey]
return dir return dir