summaryrefslogtreecommitdiff
path: root/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-03-31 14:15:12 -0400
committerJoey Hess2014-03-31 14:15:12 -0400
commit08bb77496fe17dd42f947f46ae6928178d995e75 (patch)
treecba973f16508cf7bfcf6dd2c990ee28722ca43f6 /Propellor
parentbf5663d545312d8086a56f6d7e5a34da8fe723e3 (diff)
propellor spin
Diffstat (limited to 'Propellor')
-rw-r--r--Propellor/CmdLine.hs7
1 files changed, 3 insertions, 4 deletions
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 ()