From 08bb77496fe17dd42f947f46ae6928178d995e75 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 31 Mar 2014 14:15:12 -0400 Subject: propellor spin --- Propellor/CmdLine.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Propellor') diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs index 6b33ae0d..3a0d9131 100644 --- a/Propellor/CmdLine.hs +++ b/Propellor/CmdLine.hs @@ -132,12 +132,11 @@ boot props = do putStrLn $ toMarked statusMarker $ show $ if havering then HaveKeyRing else NeedKeyRing hFlush stdout reply <- getContents + makePrivDataDir writeFileProtected privDataLocal $ fromMarked privDataMarker reply - let keyringb64 = fromMarked keyringMarker reply - case fromB64Maybe keyringb64 of - Nothing -> noop - Just s -> writeFileProtected keyring s + maybe noop (writeFileProtected keyring) $ fromB64Maybe $ + fromMarked keyringMarker reply ensureProperties props addKey :: String -> IO () -- cgit v1.2.3