summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Propellor/CmdLine.hs8
-rw-r--r--src/Propellor/Spin.hs7
2 files changed, 6 insertions, 9 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index 5e6769c9..f708c1d9 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -125,12 +125,8 @@ defaultMain hostlist = withConcurrentOutput $ do
( runhost hn
, go cr (Spin [hn] Nothing)
)
- go _ (SimpleRun hn) = runhost hn
- go cr (Continue cmdline@(SimpleRun hn)) =
- -- --continue SimpleRun is used by --spin,
- -- and unlike all other uses of --continue, this legacy one
- -- wants a build first
- forceConsole >> fetchFirst (buildFirst cr cmdline (runhost hn))
+ go cr cmdline@(SimpleRun hn) = forceConsole >>
+ fetchFirst (buildFirst cr cmdline (runhost hn))
-- When continuing after a rebuild, don't want to rebuild again.
go _ (Continue cmdline) = go NoRebuild cmdline
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs
index 6246b04f..495ebaf4 100644
--- a/src/Propellor/Spin.hs
+++ b/src/Propellor/Spin.hs
@@ -112,9 +112,10 @@ spin' mprivdata relay target hst = do
]
runcmd = "cd " ++ localdir ++ " && ./propellor " ++ cmd
- cmd = if viarelay
- then "--serialized " ++ shellEscape (show (Spin [target] (Just target)))
- else "--continue " ++ shellEscape (show (SimpleRun target))
+ cmd = "--serialized " ++ shellEscape (show cmdline)
+ cmdline
+ | viarelay = Spin [target] (Just target)
+ | otherwise = SimpleRun target
getprivdata = case mprivdata of
Nothing