From e10ff3e4656d1ca1c19edb115bbbfdb7a22b51c6 Mon Sep 17 00:00:00 2001
From: joe <joe@jerkface.net>
Date: Sat, 12 Apr 2014 02:26:49 -0400
Subject: more simplification

---
 kiki.hs | 7 +++----
 1 file 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
                         hPutStrLn fh wip
 
                 db' <- f (rtSecring rt,grip) db (rtPubring rt)
-                let lk = (rtRings rt,[])
-                maybe (if n==0 then pass 1 else return (lk,db))
-                      (return . (lk,))
+                maybe (if n==0 then pass 1 else return (rtRings rt,db))
+                      (return . (rtRings rt,))
                       db'
-        ((fsns,failed_locks),db) <- pass 0
+        (fsns,db) <- pass 0
 
         let lkmap = Map.fromList $ map (,()) fsns
         writeOutKeyrings lkmap db
-- 
cgit v1.2.3