summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--KeyRing.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/KeyRing.hs b/KeyRing.hs
index ad9f45a..8cd4bcb 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -904,8 +904,8 @@ writeRingKeys krd db wk secring pubring = do
904 return $ KikiSuccess report 904 return $ KikiSuccess report
905 905
906 906
907runKeyRing :: KeyRingData -> (KeyRingRuntime -> a) -> IO (KikiResult a) 907runKeyRing :: KeyRingData -> IO (KikiResult KeyRingRuntime)
908runKeyRing keyring op = do 908runKeyRing keyring = do
909 homedir <- getHomeDir (homeSpec keyring) 909 homedir <- getHomeDir (homeSpec keyring)
910 let try' :: KikiCondition a -> (a -> IO (KikiResult b)) -> IO (KikiResult b) 910 let try' :: KikiCondition a -> (a -> IO (KikiResult b)) -> IO (KikiResult b)
911 -- FIXME: try' should probably accept a list of KikiReportActions. 911 -- FIXME: try' should probably accept a list of KikiReportActions.
@@ -949,7 +949,7 @@ runKeyRing keyring op = do
949 bresult <- buildKeyDB secring pubring grip0 keyring 949 bresult <- buildKeyDB secring pubring grip0 keyring
950 950
951 try' bresult $ \((db,grip,wk),report_imports) -> do 951 try' bresult $ \((db,grip,wk),report_imports) -> do
952 a <- return $ op KeyRingRuntime 952 let a = KeyRingRuntime
953 { rtPubring = pubring 953 { rtPubring = pubring
954 , rtSecring = secring 954 , rtSecring = secring
955 , rtGrip = grip 955 , rtGrip = grip