propellor spin

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.

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