diff options
author | joe <joe@jerkface.net> | 2014-04-12 02:26:49 -0400 |
---|---|---|
committer | joe <joe@jerkface.net> | 2014-04-12 02:26:49 -0400 |
commit | e10ff3e4656d1ca1c19edb115bbbfdb7a22b51c6 (patch) | |
tree | de9860c636241361cac897c4dfcef15ad3eb54d7 /kiki.hs | |
parent | 6fe0904372a25808d68000e32dac7826f9c1f0e9 (diff) |
more simplification
Diffstat (limited to 'kiki.hs')
-rw-r--r-- | kiki.hs | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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 |