Explorar el Código

cmdline/apt-key: Accept nonexistent --keyring file with adv as well

Johan Kiviniemi hace 13 años
padre
commit
ecc46c1c42
Se han modificado 2 ficheros con 4 adiciones y 2 borrados
  1. 1 1
      cmdline/apt-key
  2. 3 1
      debian/changelog

+ 1 - 1
cmdline/apt-key

@@ -163,7 +163,7 @@ if [ "$1" = "--keyring" ]; then
         #echo "keyfile given"
 	shift
 	TRUSTEDFILE="$1"
-	if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ]; then
+	if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ] || [ "$2" = 'adv' ]; then
 		GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE"
 	else
 		echo >&2 "Error: The specified keyring »$TRUSTEDFILE« is missing or not readable"

+ 3 - 1
debian/changelog

@@ -11,7 +11,9 @@ apt (0.9.8.2) UNRELEASED; urgency=low
     - fix build failure when building without NLS (closes: #671587)
 
   [ Johan Kiviniemi ]
-  * cmdline/apt-key: Create new keyrings with mode 0644 instead of 0600.
+  * cmdline/apt-key:
+    - Create new keyrings with mode 0644 instead of 0600.
+    - Accept a nonexistent --keyring file with the adv subcommand as well.
 
  -- Christian Perrier <bubulle@debian.org>  Thu, 16 May 2013 22:28:22 +0200