Removed redundant "Packet" from output of packet.

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index 84d484d..c7fcebc 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -1983,7 +1983,7 @@ ifSecret _                    t f = f
 showPacket :: Packet -> String
 showPacket p | isKey p   = (if is_subkey p
                               then showPacket0 p
-                              else ifSecret p "----Secret-----" "----Public-----")
+                              else ifSecret p "---Secret" "---Public")
                            ++ " "++fingerprint p
                            ++ " "++show (key_algorithm p)
                            ++ case key_nbits p of { 0 -> ""; n -> "("++show n++")" }
@@ -2004,7 +2004,12 @@ showPacket p | isKey p   = (if is_subkey p
             xs = hashed_subpackets p
 
 
-showPacket0 p = concat . take 1 $ words (show p)
+showPacket0 p = dropSuffix "Packet" . concat . take 1 $ words (show p)
+ where
+    dropSuffix :: String -> String -> String
+    dropSuffix _    [] = ""
+    dropSuffix suff (x:xs) | (x:xs)==suff = ""
+                           | otherwise    = x:dropSuffix suff xs
 
 
 -- | returns Just True so as to indicate that