From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 23 Aug 2011 09:20:51 +0000 (+0200)
Subject: * cmdline/apt-key:
X-Git-Tag: 0.8.15.7~1^2~7
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/9120d409efc74891d008a7cfc5180c1ac8645c8c?ds=inline
* cmdline/apt-key:
- if command is 'add' do not error out if the specified
keyring doesn't exist, it will be created by gpg
---
diff --git a/cmdline/apt-key b/cmdline/apt-key
index e632be706..97d6e0323 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -152,7 +152,7 @@ if [ "$1" = "--keyring" ]; then
#echo "keyfile given"
shift
TRUSTEDFILE="$1"
- if [ -r "$TRUSTEDFILE" ]; then
+ if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ]; 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 e1c9ac350..0311979af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,8 +21,11 @@ apt (0.8.15.7) UNRELEASED; urgency=low
but do not fail if a hash can't be found
* apt-pkg/acquire.cc:
- non-existing directories are by definition clean
+ * cmdline/apt-key:
+ - if command is 'add' do not error out if the specified
+ keyring doesn't exist, it will be created by gpg
- -- David Kalnischkies <kalnischkies@gmail.com> Mon, 22 Aug 2011 23:08:47 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Tue, 23 Aug 2011 11:19:47 +0200
apt (0.8.15.6) unstable; urgency=low