summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kiki.hs7
1 files changed, 3 insertions, 4 deletions
diff --git a/kiki.hs b/kiki.hs
index 496eb3c..b0f8b3b 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1376,11 +1376,10 @@ cross_merge doDecrypt homespec keyrings wallets f = do
1376 hPutStrLn fh wip 1376 hPutStrLn fh wip
1377 1377
1378 db' <- f (rtSecring rt,grip) db (rtPubring rt) 1378 db' <- f (rtSecring rt,grip) db (rtPubring rt)
1379 let lk = (rtRings rt,[]) 1379 maybe (if n==0 then pass 1 else return (rtRings rt,db))
1380 maybe (if n==0 then pass 1 else return (lk,db)) 1380 (return . (rtRings rt,))
1381 (return . (lk,))
1382 db' 1381 db'
1383 ((fsns,failed_locks),db) <- pass 0 1382 (fsns,db) <- pass 0
1384 1383
1385 let lkmap = Map.fromList $ map (,()) fsns 1384 let lkmap = Map.fromList $ map (,()) fsns
1386 writeOutKeyrings lkmap db 1385 writeOutKeyrings lkmap db