No longer attempts to re-add keys that are already present.

1 files changed, 9 insertions, 22 deletions

diff --git a/kiki.hs b/kiki.hs
index c9483a0..d590cd4 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1058,35 +1058,22 @@ main = do
         let (uids,subkeys) = break isSubkey subs
             isSubkey p = isKey p && is_subkey p
 
+            (subkeys',remainder) = break isTopKey subkeys
+            isTopKey p@(SecretKeyPacket {}) | not (is_subkey p) = True
+            isTopKey _ = False
+
         let parseKeySpec hint spec = case break (==':') spec of
                                     (fmt,_:file) -> (fmt,file)
                                     (file,"") -> (guessKeyFormat hint (key_usage cmd), file)
             (secfmt,secfile) = parseKeySpec 'S' $ seckey cmd
             -- (pubfmt,pubfile) = parseKeySpec 'P' $ pubkey cmd
         Message parsedkey <- readKeyFromFile False secfmt secfile
-        -- -- Message pubkey <- readKeyFromFile True  pubfmt pubfile
-        
-        -- putStrLn $ "parsedkey = " ++ show (head parsedkey)
-        -- putStrLn $ "----------"
 
-        {-
-        let seckeys = filter isSecretKey sec
-            isSecretKey (SecretKeyPacket {}) = True
-            isSecretKey _ = False
-            algos = map symmetric_algorithm seckeys
-        putStrLn $ show $ symmetric_algorithm wk
-        putStrLn $ show $ s2k wk
-        putStrLn $ show $ s2k_useage wk
-        putStrLn $ PP.ppShow sec
-        let -- e = encryptSecretKey wk pw (head seckey)
-            e = head seckey
-            d = if symmetric_algorithm e /= Unencrypted
-                 then maybeToList $ decryptSecretKey pw e
-                 else [e]
-        putStrLn $ "e      = " ++ show (e)
-        -}
-        -- putStrLn $ "wkun = " ++ show wkun
-        -- putStrLn $ "head subkeys = " ++ show (head subkeys)
+        let pkf = fingerprint (head parsedkey)
+            (prepk,pks) = seek_key pkf subkeys'
+
+        if not (null pks) then putStrLn "Key already present."
+                          else do
 
         g <- newGenIO
         timestamp <- now