summaryrefslogtreecommitdiff
path: root/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-03-31 14:24:15 -0400
committerJoey Hess2014-03-31 14:24:15 -0400
commit3690257a9c324b2eed138903a2e940d53fc58d7d (patch)
tree364ef3aadb119bc93e7dcb1a39306b32099535df /Propellor
parent5c814d378063f3c3aeb1dfe4021bc0a3c991056a (diff)
propellor spin
Diffstat (limited to 'Propellor')
-rw-r--r--Propellor/CmdLine.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs
index 69e68351..89fe9e36 100644
--- a/Propellor/CmdLine.hs
+++ b/Propellor/CmdLine.hs
@@ -81,7 +81,7 @@ spin host = do
-- Display remaining output.
void $ tryIO $ forever $
- putStrLn =<< hGetLine fromh
+ showremote =<< hGetLine fromh
hClose fromh
where
@@ -104,9 +104,10 @@ spin host = do
l <- hGetLine h
case readish =<< fromMarked statusMarker l of
Nothing -> do
- putStrLn l
+ showremote l
getstatus h
Just status -> return status
+ showremote s = putStrLn $ host ++ ": " ++ s
data BootStrapStatus = HaveKeyRing | NeedKeyRing
deriving (Read, Show, Eq)