summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2015-11-01 11:48:55 -0400
committerJoey Hess2015-11-01 11:48:55 -0400
commit2891006d9f18b9f50b7d8dfc6d32e326499913f0 (patch)
tree019773353ef5ad2ce7ab66db7b0602ef0e6072b6 /src/Propellor
parent5ea24b22709b0cb62fdede3de5d9f07937a443bc (diff)
propellor spin
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Spin.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Propellor/Spin.hs b/src/Propellor/Spin.hs
index 478d1517..0650e54d 100644
--- a/src/Propellor/Spin.hs
+++ b/src/Propellor/Spin.hs
@@ -64,7 +64,6 @@ spin' mprivdata relay target hst = do
getprivdata
-- And now we can run it.
- flushConcurrentOutput
unlessM (boolSystem "ssh" (map Param $ cacheparams ++ ["-t", sshtarget, shellWrap runcmd])) $
error "remote propellor failed"
where
@@ -105,8 +104,10 @@ spin' mprivdata relay target hst = do
d <- readPrivDataFile f
nukeFile f
return d
- | otherwise ->
- filterPrivData hst <$> decryptPrivData
+ | otherwise -> do
+ d <- filterPrivData hst <$> decryptPrivData
+ flushConcurrentOutput
+ return d
Just pd -> pure pd
-- Check if the Host contains an IP address that matches one of the IPs