runKeyRing returns a KeyRingRuntime object rather than accepting an op

parameter.

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
     return $ KikiSuccess report
 
 
-runKeyRing :: KeyRingData -> (KeyRingRuntime -> a) -> IO (KikiResult a)
-runKeyRing keyring op = do
+runKeyRing :: KeyRingData -> IO (KikiResult KeyRingRuntime)
+runKeyRing keyring = do
     homedir <- getHomeDir (homeSpec keyring)
     let try' :: KikiCondition a -> (a -> IO (KikiResult b)) -> IO (KikiResult b)
         -- FIXME: try' should probably accept a list of KikiReportActions.
@@ -949,7 +949,7 @@ runKeyRing keyring op = do
          bresult <- buildKeyDB secring pubring grip0 keyring
 
          try' bresult $ \((db,grip,wk),report_imports) -> do
-             a <- return $ op KeyRingRuntime
+             let a = KeyRingRuntime
                             { rtPubring = pubring
                             , rtSecring = secring
                             , rtGrip = grip