From 4a7b19ea49923de05aca639816d27dc184cdb25a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Mar 2016 17:05:25 -0400 Subject: 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. --- src/Propellor/Spin.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Spin.hs') 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" ] -- cgit v1.3-2-g0d8e