diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-10-17 14:48:15 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-17 14:48:15 -0400 |
| commit | f6e352767eaf236acb929a9793dee28eb4897baa (patch) | |
| tree | 57189708f4142015de967938d4e098a2ea6e165e /src/Propellor/CmdLine.hs | |
| parent | fe052464493571ac26d825823c8c6e95ddb096e2 (diff) | |
| parent | 57f4eca88a1c3762b452171ee0a9d1a4f1367402 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/CmdLine.hs')
| -rw-r--r-- | src/Propellor/CmdLine.hs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index 1225f411..e0830693 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -119,14 +119,11 @@ defaultMain hostlist = do go True cmdline = updateFirst cmdline $ go False cmdline go False (Spin hs r) = do commitSpin - forM_ hs $ \hn -> withhost hn $ - spin hn r mempty + forM_ hs $ \hn -> withhost hn $ spin hn r go False cmdline@(SimpleRun hn) = buildFirst cmdline $ go False (Run hn) - go False cmdline@(ControlledRun hn cc) = buildFirst cmdline $ - onlyprocess $ withhost hn $ mainProperties cc go False (Run hn) = ifM ((==) 0 <$> getRealUserID) - ( onlyprocess $ withhost hn $ mainProperties mempty + ( onlyprocess $ withhost hn mainProperties , go True (Spin [hn] Nothing) ) |