2 files changed, 17 insertions, 1 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index f5d2938..0c1fc2a 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -253,6 +253,7 @@ data FileType = KeyRingFile
               | WalletFile
               | DNSPresentation
               | Hosts
+ deriving (Eq,Ord,Enum,Show)
 
 -- | Use this type to indicate whether a file of type 'KeyRingFile' is expected
 -- to contain secret or public PGP key packets.  Note that it is not supported
@@ -274,6 +275,7 @@ data KeyFilter = KF_None -- ^ No keys will be imported.
                | KF_Authentic -- ^ Keys are imported if they belong to an authenticated
                               -- identity (signed or self-authenticating).
                | KF_All -- ^ All keys will be imported.
+  deriving (Eq,Ord,Show)
 
 -- | This type describes how 'runKeyRing' will treat a file.
 data StreamInfo = StreamInfo { access :: Access
@@ -324,6 +326,7 @@ data StreamInfo = StreamInfo { access :: Access
     -- ^ Per-file transformations that occur before the contents of a file are
     -- spilled into the common pool.
     }
+ deriving (Eq,Show)
 
 
 spillable :: StreamInfo -> Bool
@@ -398,6 +401,17 @@ data PassphraseSpec = PassphraseSpec
     -- | Use this to carry pasphrases from a previous run.
     | PassphraseMemoizer (MappedPacket -> IO (KikiCondition Packet))
 
+instance Show PassphraseSpec where
+    show (PassphraseSpec a b c) = "PassphraseSpec "++show (a,b,c)
+    show (PassphraseMemoizer _) = "PassphraseMemoizer"
+instance Eq PassphraseSpec where
+    PassphraseSpec a b c == PassphraseSpec d e f
+        = and [a==d,b==e,c==f]
+    _ == _
+        = False
+
+
+
 data Transform =
         Autosign
         -- ^ This operation will make signatures for any tor-style UID
@@ -410,7 +424,7 @@ data Transform =
         | DeleteSubKey String
         -- ^ Delete the subkey specified by the given fingerprint and any
         -- associated signatures on that key.
- deriving (Eq,Ord)
+ deriving (Eq,Ord,Show)
 
 -- | This type describes an idempotent transformation (merge or import) on a
 -- set of GnuPG keyrings and other key files.
@@ -427,6 +441,7 @@ data KeyRingOperation = KeyRingOperation
     -- files reside.  Otherwise, the evironment variable $GNUPGHOME is consulted
     -- and if that is not set, it falls back to $HOME/.gnupg.
     }
+ deriving (Eq,Show)
 
 resolveInputFile :: InputFileContext -> InputFile -> [FilePath]
 resolveInputFile ctx = resolve
diff --git a/kiki.hs b/kiki.hs
index 087e24f..0be591d 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1280,6 +1280,7 @@ kiki "merge" args | "--help" `elem` args = do
     kiki "merge" []
     -- TODO: more help
 kiki "merge" args = do
+    hPutStrLn stderr $ show op
     KikiResult rt report <- runKeyRing op
     case rt of
       KikiSuccess rt -> return ()