From 3669bd61d0e15682ce25b9a82788b8d69f87d123 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 20 Nov 2014 16:07:57 -0400 Subject: propellor spin --- src/Propellor/Engine.hs | 2 +- src/Propellor/Property/Chroot.hs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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 -- cgit v1.2.3