Oops. Now its consistent.

1 files changed, 6 insertions, 1 deletions

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