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 17:57:12 -04:00
parent 40e697556c
commit 2df64dc516
Failed to extract signature
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Propellor/CmdLine.hs
View File

@ -57,7 +57,7 @@ defaultMain getprops = go True =<< processCmdLine
go _ (Set host field) = setPrivData host field go _ (Set host field) = setPrivData host field
go _ (AddKey keyid) = addKey keyid go _ (AddKey keyid) = addKey keyid
go _ (Spin host) = withprops host $ const $ spin host go _ (Spin host) = withprops host $ const $ spin host
go True cmdline = pullFirst cmdline $ go False cmdline go True cmdline = updateFirst cmdline $ go False cmdline
go _ (Run host) = withprops host $ ensureProperties go _ (Run host) = withprops host $ ensureProperties
go _ (Boot host) = withprops host $ boot go _ (Boot host) = withprops host $ boot
@ -69,8 +69,8 @@ unknownhost h = error $ unwords
, "(perhaps you should specify the real hostname on the command line?)" , "(perhaps you should specify the real hostname on the command line?)"
] ]
pullFirst :: CmdLine -> IO () -> IO () updateFirst :: CmdLine -> IO () -> IO ()
pullFirst cmdline next = do 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
@ -106,6 +106,7 @@ pullFirst cmdline next = do
then next then next
else do else do
putStrLn "Rebuilding propeller.." putStrLn "Rebuilding propeller.."
print (oldsha, newsha)
hFlush stdout hFlush stdout
ifM (boolSystem "make" [Param "build"]) ifM (boolSystem "make" [Param "build"])
( void $ boolSystem "./propellor" [Param "--continue", Param (show cmdline)] ( void $ boolSystem "./propellor" [Param "--continue", Param (show cmdline)]