From c54b35e665f2a8ec2fff484de99fd59b0454dcff Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Mon, 15 Jul 2019 18:45:45 -0400 Subject: Switched fingerprint to wrapped ByteString + some module shuffling. --- lib/PacketTranscoder.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/PacketTranscoder.hs') diff --git a/lib/PacketTranscoder.hs b/lib/PacketTranscoder.hs index 16d1db5..759d83f 100644 --- a/lib/PacketTranscoder.hs +++ b/lib/PacketTranscoder.hs @@ -40,9 +40,9 @@ keyCompare what (SecretKeyPacket {}) (PublicKeyPacket {}) = LT keyCompare what (PublicKeyPacket {}) (SecretKeyPacket {}) = GT keyCompare what a b | keykey a==keykey b = EQ keyCompare what a b = error $ unlines ["Unable to merge "++what++":" - , if isKey a then fingerprint a else "" + , if isKey a then show $ fingerprint a else "" , PP.ppShow a - , if isKey b then fingerprint b else "" + , if isKey b then show $ fingerprint b else "" , PP.ppShow b ] -- cgit v1.2.3