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

propellor spin

This commit is contained in:
Joey Hess 2014-11-22 15:58:09 -04:00
parent adc7669b90
commit 6d13790afa
Failed to extract signature
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Propellor/CmdLine.hs
View File

@ -156,14 +156,15 @@ updateFirst' cmdline next = ifM fetchOrigin
spin :: HostName -> Maybe HostName -> Host -> IO () spin :: HostName -> Maybe HostName -> Host -> IO ()
spin target relay hst = do spin target relay hst = do
void $ actionMessage "Git commit" $ unless relaying $ do
gitCommit [Param "--allow-empty", Param "-a", Param "-m", Param "propellor spin"] void $ actionMessage "Git commit" $
-- Push to central origin repo first, if possible. gitCommit [Param "--allow-empty", Param "-a", Param "-m", Param "propellor spin"]
-- The remote propellor will pull from there, which avoids -- Push to central origin repo first, if possible.
-- us needing to send stuff directly to the remote host. -- The remote propellor will pull from there, which avoids
whenM hasOrigin $ -- us needing to send stuff directly to the remote host.
void $ actionMessage "Push to central git repository" $ whenM hasOrigin $
boolSystem "git" [Param "push"] void $ actionMessage "Push to central git repository" $
boolSystem "git" [Param "push"]
cacheparams <- toCommand <$> sshCachingParams hn cacheparams <- toCommand <$> sshCachingParams hn
when (isJust relay) $ when (isJust relay) $
@ -179,6 +180,7 @@ spin target relay hst = do
where where
hn = fromMaybe target relay hn = fromMaybe target relay
user = "root@"++hn user = "root@"++hn
relaying = relay == Just target
mkcmd = shellWrap . intercalate " ; " mkcmd = shellWrap . intercalate " ; "