* merged with mainline

[apt.git] / cmdline / apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index ed5847c552b074855dd566dd2c184c2dde033a64..0685e36f72284e9c0c45834de0a5573b22de42cf 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -9,25 +9,25 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring
 GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
 
 
-ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
 
 
 update() {
     if [ ! -f $ARCHIVE_KEYRING ]; then
        echo >&2 "ERROR: Can't find the archive-keyring"
-       echo >&2 "Is the ubuntu-keyring package installed?"
+       echo >&2 "Is the debian-keyring package installed?"
        exit 1
     fi
 
     # add new keys
-    $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
+    $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --ignore-time-conflict --import
 
     # remove no-longer used keys
-    keys=`$GPG_CMD --keyring $REMOVED_KEYS --list-keys|awk '/^pub/{print $2}'`
+    keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys|awk '/^pub/{FS=":";print $5}'`
     for key in $keys; do
-       if $GPG --list-keys | awk '/^pub/{print $2}'|grep -q $key; then
-           $GPG --quiet --batch --delete-key --yes "${key#*/}"
+       if $GPG --list-keys --with-colons | awk '/^pub/{FS=":";print $5}'|grep -q $key; then
+           $GPG --quiet --batch --delete-key --yes ${key}
        fi
     done
 }