From d3ddb231a6551ec14822a27d11ec35d72e7ed4b9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 31 Mar 2014 18:39:39 -0400 Subject: propellor spin --- Propellor/CmdLine.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Propellor/CmdLine.hs') diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs index 22a014af..5a794ada 100644 --- a/Propellor/CmdLine.hs +++ b/Propellor/CmdLine.hs @@ -74,7 +74,8 @@ updateFirst cmdline next = do branchref <- takeWhile (/= '\n') <$> readProcess "git" ["symbolic-ref", "HEAD"] let originbranch = "origin" takeFileName branchref - void $ boolSystem "git" [Param "fetch"] + + void $ actionMessage "Fetching" $ boolSystem "git" [Param "fetch"] whenM (doesFileExist keyring) $ do {- To verify origin/master commit's signature, have to @@ -128,7 +129,7 @@ spin host = do void $ tryIO $ forever $ showremote =<< hGetLine fromh hClose fromh - status <- getstatus fromh `catchIO` (const $ errorMessage "protocol error") + status <- getstatus fromh `catchIO` (const $ errorMessage "protocol error (perhaps the remote propellor failed to run?)") case status of Ready -> finish NeedGitClone -> do -- cgit v1.2.3