From 1bac5f8f59ee84cbd0ec674323236e1c22c1bbc0 Mon Sep 17 00:00:00 2001 From: joe Date: Mon, 25 Apr 2016 20:31:06 -0400 Subject: DeleteSubKey renamed to DeleteSubkeyByFingerprint. --- kiki.hs | 4 ++-- lib/KeyRing.hs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kiki.hs b/kiki.hs index 842e697..e10c2a8 100644 --- a/kiki.hs +++ b/kiki.hs @@ -1330,7 +1330,7 @@ kiki "merge" args = do doDelete :: String -> StreamInfo -> KeyRingOperation -> (StreamInfo,KeyRingOperation) doDelete fp flow op = ( flow - , op { opTransforms = opTransforms op ++ [DeleteSubKey fp] } ) + , op { opTransforms = opTransforms op ++ [DeleteSubkeyByFingerprint fp] } ) doAutosign :: Bool -> StreamInfo -> KeyRingOperation -> (StreamInfo,KeyRingOperation) doAutosign True flow op = @@ -1568,7 +1568,7 @@ kiki "delete" args = do ] , opPassphrases = do pfile <- maybeToList passfd return $ PassphraseSpec Nothing Nothing pfile - , opTransforms = map DeleteSubKey fps + , opTransforms = map DeleteSubkeyByFingerprint fps , opHome = homespec } KikiResult rt report <- runKeyRing kikiOp diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs index 1c6dea8..74b883f 100644 --- a/lib/KeyRing.hs +++ b/lib/KeyRing.hs @@ -428,7 +428,7 @@ data Transform = -- A tor-style UID is one of the following form: -- -- > Anonymous - | DeleteSubKey String + | DeleteSubkeyByFingerprint String -- ^ Delete the subkey specified by the given fingerprint and any -- associated signatures on that key. deriving (Eq,Ord,Show) @@ -2687,7 +2687,7 @@ resolveTransform Autosign rt kd@(KeyData k ksigs umap submap) = ops gs = groupBy sameMaster (sortBy (comparing code) bindings') -resolveTransform (DeleteSubKey fp) rt kd@(KeyData k ksigs umap submap) = fmap (SubKeyDeletion topk) subk +resolveTransform (DeleteSubkeyByFingerprint fp) rt kd@(KeyData k ksigs umap submap) = fmap (SubKeyDeletion topk) subk where topk = keykey $ packet k -- key to master of key to be deleted subk = do -- cgit v1.2.3