diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-10-16 14:23:14 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-16 14:23:14 -0400 |
| commit | 4b848fedbf2d3a7b7ba94abd2b0ed8526df2fac7 (patch) | |
| tree | 8e8d067bebb2e82e0e8354ff871791f2e1c7114f /src/Propellor/CmdLine.hs | |
| parent | 51634a1bfc091b0c2e005e58266771dab0710ffe (diff) | |
| parent | e66b62f40bcb29ca62c905dabe87cc6e91a6bccd (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/CmdLine.hs')
| -rw-r--r-- | src/Propellor/CmdLine.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index 33bb0bdc..35929ea7 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -115,11 +115,14 @@ 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 + forM_ hs $ \hn -> withhost hn $ + spin hn r mempty 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 + ( onlyprocess $ withhost hn $ mainProperties mempty , go True (Spin [hn] Nothing) ) |