summaryrefslogtreecommitdiff
path: root/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-03-31 12:30:05 -0400
committerJoey Hess2014-03-31 12:30:05 -0400
commit546e3282a08b9eb9d590ed932e28bba368cf080b (patch)
tree9ba4c4e28e38e460e8df779ff002aa42d40e4d39 /Propellor
parent8331629fa738929217aafe93b96aa68776ace24f (diff)
propellor spin
Diffstat (limited to 'Propellor')
-rw-r--r--Propellor/CmdLine.hs6
1 files changed, 6 insertions, 0 deletions
diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs
index 3001c98f..4ce33858 100644
--- a/Propellor/CmdLine.hs
+++ b/Propellor/CmdLine.hs
@@ -82,7 +82,11 @@ spin host = do
hPutStrLn stderr "POST-KEYRING"
hFlush stderr
hPutStrLn toh $ toMarked privDataMarker privdata
+ hPutStrLn stderr "POST-PRIVDATA"
+ hFlush stderr
hFlush toh
+
+ -- Propigate remaining output.
void $ tryIO $ forever $
putStrLn =<< hGetLine fromh
hClose fromh
@@ -148,6 +152,8 @@ boot props = do
(proc "gpg" $ gpgopts ++ ["--import", "-a"]) $ \h -> do
hPutStr h keyringarmored
hFlush h
+ hPutStrLn stderr $ "READY"
+ hFlush stderr
ensureProperties props
addKey :: String -> IO ()