Преглед изворни кода

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
David Kalnischkies пре 10 година
родитељ
комит
a5f9b45e4a
2 измењених фајлова са 3 додато и 17 уклоњено
  1. 1 4
      cmdline/apt-key.in
  2. 2 13
      doc/apt-key.8.xml

+ 1 - 4
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)

+ 2 - 13
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>