From 2891006d9f18b9f50b7d8dfc6d32e326499913f0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Nov 2015 11:48:55 -0400 Subject: propellor spin --- src/Propellor/Spin.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/Propellor') 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 -- cgit v1.2.3