summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/CmdLine.hs3
-rw-r--r--src/Propellor/Protocol.hs12
2 files changed, 6 insertions, 9 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index 744a97ad..95387b83 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -202,7 +202,6 @@ spin hn hst = do
go cacheparams privdata = withBothHandles createProcessSuccess (proc "ssh" $ cacheparams ++ [user, bootstrapcmd]) $ \(toh, fromh) -> do
let loop = do
status <- getMarked fromh statusMarker
- print (">>", status)
case readish =<< status of
Just NeedRepoUrl -> do
sendMarked toh repoUrlMarker
@@ -299,7 +298,7 @@ boot = do
hClose stdin
hout <- dup stdOutput
hClose stdout
- unlessM (boolSystem "git" [Param "pull", Param $ "--upload=pack=./propellor gitpush " ++ show hin ++ " " ++ show hout, Param "."]) $
+ unlessM (boolSystem "git" [Param "pull", Param $ "--upload=pack=./propellor --gitpush " ++ show hin ++ " " ++ show hout, Param "."]) $
warningMessage "git pull from client failed"
-- Shim for git push over the propellor ssh channel.
diff --git a/src/Propellor/Protocol.hs b/src/Propellor/Protocol.hs
index bdea7d10..7bbf472d 100644
--- a/src/Propellor/Protocol.hs
+++ b/src/Propellor/Protocol.hs
@@ -47,13 +47,11 @@ getMarked :: Handle -> Marker -> IO (Maybe String)
getMarked h marker = go =<< catchMaybeIO (hGetLine h)
where
go Nothing = return Nothing
- go (Just l) = do
- hPutStrLn stderr $ show ("got ", l)
- case fromMarked marker l of
- Nothing -> do
- putStrLn l
- getMarked h marker
- Just v -> return (Just v)
+ go (Just l) = case fromMarked marker l of
+ Nothing -> do
+ putStrLn l
+ getMarked h marker
+ Just v -> return (Just v)
req :: Stage -> Marker -> (String -> IO ()) -> IO ()
req stage marker a = do