diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-20 13:28:53 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-20 13:28:53 -0400 |
| commit | 394d44880ede6dd7fb916f21ca4fe24d9b3549c6 (patch) | |
| tree | ae41ec177598827b743449a461a8fd20b27ce174 /src/Propellor/CmdLine.hs | |
| parent | 8e27dce708f9af48712dfa26274715ce22cb40e0 (diff) | |
| parent | 80109620f6af779a2c58bc5766fb77301729f60f (diff) | |
Merge branch 'master' into typed-os-requirements
Diffstat (limited to 'src/Propellor/CmdLine.hs')
| -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. |