cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-03-31 18:39:39 -04:00
parent eb78bbae19
commit d3ddb231a6
Failed to extract signature
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Propellor/CmdLine.hs
View File

@ -74,7 +74,8 @@ updateFirst cmdline next = do
branchref <- takeWhile (/= '\n') branchref <- takeWhile (/= '\n')
<$> readProcess "git" ["symbolic-ref", "HEAD"] <$> readProcess "git" ["symbolic-ref", "HEAD"]
let originbranch = "origin" </> takeFileName branchref let originbranch = "origin" </> takeFileName branchref
void $ boolSystem "git" [Param "fetch"]
void $ actionMessage "Fetching" $ boolSystem "git" [Param "fetch"]
whenM (doesFileExist keyring) $ do whenM (doesFileExist keyring) $ do
{- To verify origin/master commit's signature, have to {- To verify origin/master commit's signature, have to
@ -128,7 +129,7 @@ spin host = do
void $ tryIO $ forever $ void $ tryIO $ forever $
showremote =<< hGetLine fromh showremote =<< hGetLine fromh
hClose 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 case status of
Ready -> finish Ready -> finish
NeedGitClone -> do NeedGitClone -> do

1
Propellor/Message.hs
View File

@ -16,7 +16,6 @@ actionMessage desc a = do
let (msg, intensity, color) = getActionResult r let (msg, intensity, color) = getActionResult r
putStr $ desc ++ " ... " putStr $ desc ++ " ... "
showdesc
setSGR [SetColor Foreground intensity color] setSGR [SetColor Foreground intensity color]
putStrLn msg putStrLn msg
setSGR [] setSGR []