From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 13 Feb 2008 18:54:02 +0000 (+0100)
Subject: merged from apt--mvo
X-Git-Tag: 0.7.24ubuntu1~87
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/1bc5d775b911e64e2f1e9e12539496ce13dd0945?ds=inline;hp=-c

merged from apt--mvo
---

1bc5d775b911e64e2f1e9e12539496ce13dd0945
diff --combined cmdline/apt-key
index 7d6f9c589,6dd9fd8aa..77a2a4623
--- 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/project/ubuntu-archive-keyring.gpg
  
  add_keys_with_verify_against_master_keyring() {
      ADD_KEYRING=$1
@@@ -69,6 -72,7 +69,7 @@@ net_update() 
      fi
      new_mtime=$(stat -c %Y $keyring)
      if [ $new_mtime -ne $old_mtime ]; then
+ 	echo "Checking for new archive signing keys now"
  	add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING
      fi
  }
@@@ -76,7 -80,7 +77,7 @@@
  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