diff options
Diffstat (limited to 'kiki.hs')
-rw-r--r-- | kiki.hs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1330,7 +1330,7 @@ kiki "merge" args = do | |||
1330 | 1330 | ||
1331 | doDelete :: String -> StreamInfo -> KeyRingOperation -> (StreamInfo,KeyRingOperation) | 1331 | doDelete :: String -> StreamInfo -> KeyRingOperation -> (StreamInfo,KeyRingOperation) |
1332 | doDelete fp flow op = ( flow | 1332 | doDelete fp flow op = ( flow |
1333 | , op { opTransforms = opTransforms op ++ [DeleteSubKey fp] } ) | 1333 | , op { opTransforms = opTransforms op ++ [DeleteSubkeyByFingerprint fp] } ) |
1334 | 1334 | ||
1335 | doAutosign :: Bool -> StreamInfo -> KeyRingOperation -> (StreamInfo,KeyRingOperation) | 1335 | doAutosign :: Bool -> StreamInfo -> KeyRingOperation -> (StreamInfo,KeyRingOperation) |
1336 | doAutosign True flow op = | 1336 | doAutosign True flow op = |
@@ -1568,7 +1568,7 @@ kiki "delete" args = do | |||
1568 | ] | 1568 | ] |
1569 | , opPassphrases = do pfile <- maybeToList passfd | 1569 | , opPassphrases = do pfile <- maybeToList passfd |
1570 | return $ PassphraseSpec Nothing Nothing pfile | 1570 | return $ PassphraseSpec Nothing Nothing pfile |
1571 | , opTransforms = map DeleteSubKey fps | 1571 | , opTransforms = map DeleteSubkeyByFingerprint fps |
1572 | , opHome = homespec | 1572 | , opHome = homespec |
1573 | } | 1573 | } |
1574 | KikiResult rt report <- runKeyRing kikiOp | 1574 | KikiResult rt report <- runKeyRing kikiOp |