diff options
| author | Justus Winter <[email protected]> | 2016-12-15 13:50:10 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-12-15 13:50:10 +0000 |
| commit | 6e4396723e9e5865015ebf7033628fa3919cf7d1 (patch) | |
| tree | df65305bb7e3f846cc7ea4af7e3e112e0ac834ab | |
| parent | g10: Spell out --desig-revoke. (diff) | |
| download | gnupg-6e4396723e9e5865015ebf7033628fa3919cf7d1.tar.gz gnupg-6e4396723e9e5865015ebf7033628fa3919cf7d1.zip | |
g10: Rename 'card-edit' to 'edit-card'.
* g10/gpg.c (opts): Rename option.
* g10/call-agent.c (agent_scd_learn): Update comment.
* doc/gpg.texi: Update accordingly.
--
This change has a surprising side effect. Previously, --edit was an
alias for --edit-key, because the argument parser actually accepts
unique prefixes of all options. With this change, however, --edit is
ambiguous.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | doc/gpg.texi | 6 | ||||
| -rw-r--r-- | g10/call-agent.c | 2 | ||||
| -rw-r--r-- | g10/gpg.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index d24584ad1..81588e119 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -367,7 +367,9 @@ values are dumped and not only their lengths. Note that the output of this command may change with new releases. -@item --card-edit +@item --edit-card +@opindex edit-card +@itemx --card-edit @opindex card-edit Present a menu to work with a smartcard. The subcommand "help" provides an overview on available commands. For a detailed description, please @@ -382,7 +384,7 @@ Show the content of the smart card. @opindex change-pin Present a menu to allow changing the PIN of a smartcard. This functionality is also available as the subcommand "passwd" with the -@option{--card-edit} command. +@option{--edit-card} command. @item --delete-keys @code{name} @itemx --delete-keys @code{name} diff --git a/g10/call-agent.c b/g10/call-agent.c index fd9b96413..335e12a01 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -660,7 +660,7 @@ agent_scd_learn (struct agent_card_info_s *info, int force) care about the data returned. If the card has already been initialized, this is a very fast command. The main reason we need to do this here is to handle a card removed case so that an - "l" command in --card-edit can be used to show ta newly inserted + "l" command in --edit-card can be used to show ta newly inserted card. We request the openpgp card because that is what we expect. */ rc = assuan_transact (agent_ctx, "SCD SERIALNO openpgp", @@ -495,7 +495,8 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_c (aFastImport, "fast-import", "@"), #ifdef ENABLE_CARD_SUPPORT ARGPARSE_c (aCardStatus, "card-status", N_("print the card status")), - ARGPARSE_c (aCardEdit, "card-edit", N_("change data on a card")), + ARGPARSE_c (aCardEdit, "edit-card", N_("change data on a card")), + ARGPARSE_c (aCardEdit, "card-edit", "@"), ARGPARSE_c (aChangePIN, "change-pin", N_("change a card's PIN")), #endif ARGPARSE_c (aListConfig, "list-config", "@"), |