diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-06 19:00:49 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-06 19:00:49 -0400 |
| commit | e8f36722bf23a19dcdd42a1c14ebaa40a2d73293 (patch) | |
| tree | 553cd675d18cb83bfd4e365066827191b6c4e08c /src/Propellor/Spin.hs | |
| parent | 3a9c23d6463c15c1fc5568df4c0ec212c2a84cd7 (diff) | |
| parent | 463418726ad8d8b80b5f0aae302c18c1516774f8 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Spin.hs')
| -rw-r--r-- | src/Propellor/Spin.hs | 7 |
1 files changed, 4 insertions, 3 deletions
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 |