cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-11-20 16:07:57 -04:00
parent 00cab6901f
commit 3669bd61d0
Failed to extract signature
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Propellor/Engine.hs
View File

@ -77,6 +77,6 @@ processChainOutput h = go Nothing
Nothing -> pure $ fromMaybe FailedChange $ Nothing -> pure $ fromMaybe FailedChange $
readish =<< lastline readish =<< lastline
Just s -> do Just s -> do
maybe noop putStrLn lastline maybe noop (\l -> unless (null l) (putStrLn l)) lastline
hFlush stdout hFlush stdout
go (Just s) go (Just s)

1
src/Propellor/Property/Chroot.hs
View File

@ -109,6 +109,7 @@ chain hostlist hn loc = case findHostNoAlias hostlist hn of
where where
go h = do go h = do
changeWorkingDirectory localdir changeWorkingDirectory localdir
forceConsole
onlyProcess (provisioningLock loc) $ do onlyProcess (provisioningLock loc) $ do
r <- runPropellor h $ ensureProperties $ hostProperties h r <- runPropellor h $ ensureProperties $ hostProperties h
putStrLn $ "\n" ++ show r putStrLn $ "\n" ++ show r