* 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 e632be706c49c581d3d9593ec3e48e2a9ec9c34d..97d6e03235ea6738dd2074d58e27f508fa3c9c91 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -152,7 +152,7 @@ if [ "$1" = "--keyring" ]; then
         #echo "keyfile given"
        shift
        TRUSTEDFILE="$1"
         #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"
                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 e1c9ac35096dfa5287043cc7230ff08b4db1f3a9..0311979afdce26eb6b05a21282096b0e65af774a 100644 (file)
--- 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
       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
 
 
 apt (0.8.15.6) unstable; urgency=low