From 546e3282a08b9eb9d590ed932e28bba368cf080b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 31 Mar 2014 12:30:05 -0400 Subject: [PATCH] propellor spin --- Propellor/CmdLine.hs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs index 3001c98..4ce3385 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 ()