From: Johan Kiviniemi <devel@johan.kiviniemi.name>
Date: Wed, 22 May 2013 18:14:33 +0000 (+0300)
Subject: cmdline/apt-key: Accept nonexistent --keyring file with adv as well
X-Git-Tag: 0.9.9~10^2^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/ecc46c1c42bb1aa59a0c8f0fb3eb12a5938da6ca?ds=inline

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

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 309c51b13..2c087acbc 100755
--- a/cmdline/apt-key
+++ b/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"
diff --git a/debian/changelog b/debian/changelog
index 89da46ed1..b3800fc42 100644
--- a/debian/changelog
+++ b/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