diff options
| author | Johan Kiviniemi <devel@johan.kiviniemi.name> | 2013-05-22 21:14:33 +0300 |
|---|---|---|
| committer | Johan Kiviniemi <devel@johan.kiviniemi.name> | 2013-05-22 21:14:33 +0300 |
| commit | ecc46c1c42bb1aa59a0c8f0fb3eb12a5938da6ca (patch) | |
| tree | 86c48e2adf18bd206990d352e171a872180fd256 | |
| parent | 5de346684f6777eb9e2ac1a38d687c1bc50f35b0 (diff) | |
cmdline/apt-key: Accept nonexistent --keyring file with adv as well
| -rwxr-xr-x | cmdline/apt-key | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 4 insertions, 2 deletions
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 |