diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-08 23:54:43 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-08 23:54:43 -0400 |
| commit | 67054800d4dccdb6634b723652257b3a6d1538cf (patch) | |
| tree | 19ccdf98a6f89cca57a5a4ff100d3875fba70e0c /src | |
| parent | 6991fdd75285e4d2173d92251780bec02fd91660 (diff) | |
when run w/o parameters as root, update from git and build
Got lost in recent changes and broke the cron job.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/CmdLine.hs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index 1761a11e..ee057d05 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -122,11 +122,10 @@ defaultMain hostlist = withConcurrentOutput $ do go cr cmdline@(Spin hs mrelay) = buildFirst cr cmdline $ do unless (isJust mrelay) commitSpin forM_ hs $ \hn -> withhost hn $ spin mrelay hn - go cr (Run hn) = fetchFirst $ - ifM ((==) 0 <$> getRealUserID) - ( runhost hn - , go cr (Spin [hn] Nothing) - ) + go cr cmdline@(Run hn) = ifM ((==) 0 <$> getRealUserID) + ( updateFirst cr cmdline $ runhost hn + , fetchFirst $ go cr (Spin [hn] Nothing) + ) go cr cmdline@(SimpleRun hn) = forceConsole >> fetchFirst (buildFirst cr cmdline (runhost hn)) -- When continuing after a rebuild, don't want to rebuild again. |