cmdline/apt-key: import from the correct keyring (ADD_KEYRING) in add_keys_with_verif...
authorMichael Vogt <michael.vogt@ubuntu.com>
Wed, 13 Feb 2008 10:15:54 +0000 (11:15 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Wed, 13 Feb 2008 10:15:54 +0000 (11:15 +0100)
cmdline/apt-key

index 5791f33..bbf3a76 100755 (executable)
@@ -41,7 +41,7 @@ add_keys_with_verify_against_master_keyring() {
        ADDED=0
        for master_key in $master_keys; do
            if $GPG_CMD --keyring $ADD_KEYRING --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then
-               $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export $add_key | $GPG --import
+               $GPG_CMD --quiet --batch --keyring $ADD_KEYRING --export $add_key | $GPG --import
                ADDED=1
            fi
        done