diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-20 16:07:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-20 16:07:57 -0400 |
| commit | 3669bd61d0e15682ce25b9a82788b8d69f87d123 (patch) | |
| tree | 7217867f1a5e420274984f2376811ed202584194 | |
| parent | 00cab6901feec708b69d4f0ac1a4d3d0ec7caa45 (diff) | |
propellor spin
| -rw-r--r-- | src/Propellor/Engine.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/Chroot.hs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs index 0cbf6247..969769ce 100644 --- a/src/Propellor/Engine.hs +++ b/src/Propellor/Engine.hs @@ -77,6 +77,6 @@ processChainOutput h = go Nothing Nothing -> pure $ fromMaybe FailedChange $ readish =<< lastline Just s -> do - maybe noop putStrLn lastline + maybe noop (\l -> unless (null l) (putStrLn l)) lastline hFlush stdout go (Just s) diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs index 9ce9ddaf..ba7bf96c 100644 --- a/src/Propellor/Property/Chroot.hs +++ b/src/Propellor/Property/Chroot.hs @@ -109,6 +109,7 @@ chain hostlist hn loc = case findHostNoAlias hostlist hn of where go h = do changeWorkingDirectory localdir + forceConsole onlyProcess (provisioningLock loc) $ do r <- runPropellor h $ ensureProperties $ hostProperties h putStrLn $ "\n" ++ show r |