From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 13 Feb 2008 14:18:22 +0000 (+0100)
Subject: merged from apt--mvo
X-Git-Tag: 0.7.24ubuntu1~91
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b08f3f535b7c55202345ae44143a202fa186afea?hp=-c

merged from apt--mvo
---

b08f3f535b7c55202345ae44143a202fa186afea
diff --combined cmdline/apt-key
index d4b61b356,bbf3a7697..533193901
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@@ -9,10 -9,13 +9,10 @@@ GPG_CMD="gpg --ignore-time-conflict --n
  GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
  
  
 -MASTER_KEYRING=""
 -ARCHIVE_KEYRING_URI=""
 -#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg
 -#ARCHIVE_KEYRING_URI=http://ftp.debian.org/debian/debian-archive-keyring.gpg
 -
 -ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
 -REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
 +MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
 +ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
 +REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
 +ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/ubuntu-archive-keyring.gpg
  
  add_keys_with_verify_against_master_keyring() {
      ADD_KEYRING=$1
@@@ -38,7 -41,7 +38,7 @@@
  	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
@@@ -65,7 -68,7 +65,7 @@@ net_update() 
  update() {
      if [ ! -f $ARCHIVE_KEYRING ]; then
  	echo >&2 "ERROR: Can't find the archive-keyring"
 -	echo >&2 "Is the debian-archive-keyring package installed?"
 +	echo >&2 "Is the ubuntu-keyring package installed?"
  	exit 1
      fi