summaryrefslogtreecommitdiff
path: root/Propellor/CmdLine.hs
diff options
context:
space:
mode:
authorJoey Hess2014-03-31 18:06:39 -0400
committerJoey Hess2014-03-31 18:06:39 -0400
commit549df2612c0e12d44bf4e998cabdfcf3bb0a7344 (patch)
tree900b5365309aeba602b75d6405b7d2a3e3eeb233 /Propellor/CmdLine.hs
parent190a8d2876c749df2ba154de24c40b068f98b6c6 (diff)
propellor spin
Diffstat (limited to 'Propellor/CmdLine.hs')
-rw-r--r--Propellor/CmdLine.hs3
1 files changed, 1 insertions, 2 deletions
diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs
index aea1d6c2..74b2cab1 100644
--- a/Propellor/CmdLine.hs
+++ b/Propellor/CmdLine.hs
@@ -106,7 +106,6 @@ updateFirst cmdline next = do
then next
else do
putStrLn "Rebuilding propeller.."
- print (oldsha, newsha)
hFlush stdout
ifM (boolSystem "make" [Param "build"])
( void $ boolSystem "./propellor" [Param "--continue", Param (show cmdline)]
@@ -180,7 +179,7 @@ sendGitClone host url = do
withTmpFile "gitbundle" $ \tmp _ -> do
-- TODO: ssh connection caching, or better push method
-- with less connections.
- void $ boolSystem "git" [Param "bundle", Param "create", File tmp, Param "HEAD"]
+ void $ boolSystem "git" [Param "bundle", Param "create", Param "-2", File tmp, Param "HEAD"]
void $ boolSystem "scp" [File tmp, Param ("root@"++host++":"++remotebundle)]
void $ boolSystem "ssh" [Param ("root@"++host), Param unpackcmd]
where