summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-07-01 16:40:36 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2016-07-01 16:40:36 +0200
commita5f9b45e4a67246f7af2c6fc62de9c531cd314a4 (patch)
tree93a5366a6c2e23257a6c75f72ad40b2b1a79e50b
parentcb9ac09bd6a36e73c2dce1d529acde6e4d15e32d (diff)
alias apt-key list to finger
There is no real point in having two commands which roughly do the same thing, especially if the difference is just in the display of the fingerprint and hence security sensitive information. Closes: 829232
-rw-r--r--cmdline/apt-key.in5
-rw-r--r--doc/apt-key.8.xml15
2 files changed, 3 insertions, 17 deletions
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index 7c12c72a3..5bd8d1249 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -583,10 +583,7 @@ case "$command" in
net_update
merge_back_changes
;;
- list)
- foreach_keyring_do 'run_cmd_on_keyring' --list-keys "$@"
- ;;
- finger*)
+ list|finger*)
foreach_keyring_do 'run_cmd_on_keyring' --fingerprint "$@"
;;
export|exportall)
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index b5319efa3..a847060c0 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -89,28 +89,17 @@
</listitem>
</varlistentry>
- <varlistentry><term><option>list</option></term>
+ <varlistentry><term><option>list</option>, <option>finger</option></term>
<listitem>
<para>
- List trusted keys.
+ List trusted keys with fingerprints.
</para>
</listitem>
</varlistentry>
-
- <varlistentry><term><option>finger</option></term>
- <listitem>
- <para>
- List fingerprints of trusted keys.
-
- </para>
-
- </listitem>
- </varlistentry>
-
<varlistentry><term><option>adv</option></term>
<listitem>
<para>