diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-07 17:05:25 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-07 17:05:25 -0400 |
| commit | 4a7b19ea49923de05aca639816d27dc184cdb25a (patch) | |
| tree | 6da836d12928daa43689e8e07f9e500b15c7fae0 /src/Propellor/Spin.hs | |
| parent | a654b64ac5d466039494673c5e829c94a3902ce2 (diff) | |
make Cron.runPropellor pass System to bootstrapPropellorCommand
Rather than having the property fail when the Host has no OS defined,
I made bootstrapPropellorCommand not install deps in this situation.
The cron job will (probably) still work, unless a system upgrade causes
deps to be removed.
Diffstat (limited to 'src/Propellor/Spin.hs')
| -rw-r--r-- | src/Propellor/Spin.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs index a2afe29f..2c57f57d 100644 --- a/src/Propellor/Spin.hs +++ b/src/Propellor/Spin.hs @@ -84,7 +84,7 @@ spin' mprivdata relay target hst = do -- Install, or update the remote propellor. updateServer target relay hst (proc "ssh" $ cacheparams ++ [sshtarget, shellWrap (probecmd o)]) - (proc "ssh" $ cacheparams ++ [sshtarget, shellWrap (updatecmd o)]) + (proc "ssh" $ cacheparams ++ [sshtarget, shellWrap (updatecmd (Just o))]) =<< getprivdata -- And now we can run it. @@ -102,7 +102,7 @@ spin' mprivdata relay target hst = do [ installGitCommand sys , "echo " ++ toMarked statusMarker (show NeedGitClone) ] ++ ") || echo " ++ toMarked statusMarker (show NeedPrecompiled) - , "else " ++ (updatecmd sys) + , "else " ++ (updatecmd (Just sys)) , "fi" ] |