summaryrefslogtreecommitdiff
path: root/src/Propellor/CmdLine.hs
diff options
context:
space:
mode:
authorJoey Hess2015-10-20 15:43:44 -0400
committerJoey Hess2015-10-20 15:43:44 -0400
commitf66fdc8effe90d801d26604d36c01838488545b3 (patch)
tree6590460fd63fcd56503e53d5f967e1a8824071cd /src/Propellor/CmdLine.hs
parent9c48a095a4ce1ddd309644338b8b11049f19d719 (diff)
parenteeabdf5e30d5b5f88788151e1f0231d8ea562562 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/CmdLine.hs')
-rw-r--r--src/Propellor/CmdLine.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index e0830693..a0be167e 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -117,9 +117,10 @@ defaultMain hostlist = do
go _ Merge = mergeSpin
go True cmdline@(Spin _ _) = buildFirst cmdline $ go False cmdline
go True cmdline = updateFirst cmdline $ go False cmdline
- go False (Spin hs r) = do
+ go False (Spin hs mrelay) = do
commitSpin
- forM_ hs $ \hn -> withhost hn $ spin hn r
+ forM_ hs $ \hn -> withhost hn $
+ spin (maybe RegularSpin RelaySpin mrelay) hn
go False cmdline@(SimpleRun hn) = buildFirst cmdline $
go False (Run hn)
go False (Run hn) = ifM ((==) 0 <$> getRealUserID)