Added --delete support to merge command (TODO: test)

1 files changed, 6 insertions, 0 deletions

diff --git a/kiki.hs b/kiki.hs
index 2f8275d..2d926a8 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1202,6 +1202,7 @@ kiki "merge" [] = do
         , "           | --flow=(fill|spill|sync)[,(subkeys|match=SPEC)]"
         , "           | --create=CMD"
         , "           | --autosign[=no]"
+        , "           | --delete=FINGERPRINT"
         , "           | --"
         , "           | FILE ) ..."]
 kiki "merge" args | "--help" `elem` args = do
@@ -1267,6 +1268,10 @@ kiki "merge" args = do
         ( flow
         , op { opFiles= Map.insert (ArgFile fname) flow (opFiles op) })
 
+    doDelete :: String -> StreamInfo -> KeyRingOperation -> (StreamInfo,KeyRingOperation)
+    doDelete fp flow op = ( flow
+                          , op { opTransforms = opTransforms op ++ [DeleteSubKey fp] } )
+
     doAutosign :: Bool -> StreamInfo -> KeyRingOperation -> (StreamInfo,KeyRingOperation)
     doAutosign True flow op = 
         if Map.null (opFiles op)
@@ -1295,6 +1300,7 @@ kiki "merge" args = do
       dispatch =
         case parsed of
             Right fname -> doFile flow op fname
+            Left ("delete",Just fp)       -> doDelete fp flow op
             Left ("autosign",Nothing)     -> doAutosign True  flow op
             Left ("autosign",Just "y")    -> doAutosign True  flow op
             Left ("autosign",Just "yes")  -> doAutosign True  flow op