From c218706406bd627758db320d8609c56e9b7bbbab Mon Sep 17 00:00:00 2001
From: joe <joe@jerkface.net>
Date: Wed, 30 Apr 2014 21:03:38 -0400
Subject: Oops.  Now its consistent.

---
 KeyRing.hs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'KeyRing.hs')

diff --git a/KeyRing.hs b/KeyRing.hs
index bcd8ac8..53e7438 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -1608,9 +1608,14 @@ writePEMKeys doDecrypt db exports = do
 makeMemoizingDecrypter :: KeyRingOperation -> InputFileContext
                         -> IO (MappedPacket -> IO (KikiCondition Packet))
 makeMemoizingDecrypter operation ctx = do
+    -- (*) Notice we do not pass ctx to resolveForReport.
+    -- This is because the merge function does not currently use a context
+    -- and the pws map keys must match the MappedPacket locations.
+    -- TODO: Perhaps these should both be of type InputFile rather than
+    -- FilePath?
     pws <-
         Traversable.mapM (cachedContents ctx . fromJust . pwfile . typ)
-                         (Map.mapKeys (resolveForReport $ Just ctx)
+                         (Map.mapKeys (resolveForReport Nothing) -- see note (*) note above
                             $ Map.filter (isJust . pwfile . typ) $ kFiles operation)
     unkeysRef <- newIORef Map.empty
     return $ doDecrypt unkeysRef pws
-- 
cgit v1.2.3