diff options
| author | Joey Hess <joey@kitenet.net> | 2014-03-31 18:39:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-31 18:39:39 -0400 |
| commit | d3ddb231a6551ec14822a27d11ec35d72e7ed4b9 (patch) | |
| tree | d6a9ef48ac14dcf845c3df1c54a7dd06631e584d | |
| parent | eb78bbae190a0f820d6e16561fb03307eea9e4d4 (diff) | |
propellor spin
| -rw-r--r-- | Propellor/CmdLine.hs | 5 | ||||
| -rw-r--r-- | Propellor/Message.hs | 1 |
2 files changed, 3 insertions, 3 deletions
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 diff --git a/Propellor/Message.hs b/Propellor/Message.hs index 198272e7..f4c812dd 100644 --- a/Propellor/Message.hs +++ b/Propellor/Message.hs @@ -16,7 +16,6 @@ actionMessage desc a = do let (msg, intensity, color) = getActionResult r putStr $ desc ++ " ... " - showdesc setSGR [SetColor Foreground intensity color] putStrLn msg setSGR [] |