From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 13 Feb 2008 14:44:01 +0000 (+0100)
Subject: merged net-update fixes from apt--mvo
X-Git-Tag: 0.7.24ubuntu1~90
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/1f31762e69fd52fc67306d4b8af98c4e4519e2e4?hp=b08f3f535b7c55202345ae44143a202fa186afea

merged net-update fixes from apt--mvo
---

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 533193901..e0c4b5e48 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -58,8 +58,19 @@ net_update() {
     if [ ! -d /var/lib/apt/keyrings ]; then
 	mkdir -p /var/lib/apt/keyrings
     fi
+    keyring=/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING)
+    old_mtime=0
+    if [ -e $keyring ]; then
+	old_mtime=$(stat -c %Y $keyring)
+    fi
     (cd  /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI)
-    add_keys_with_verify_against_master_keyring /var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING) $MASTER_KEYRING
+    if [ ! -e $keyring ]; then
+	return
+    fi
+    new_mtime=$(stat -c %Y $keyring)
+    if [ $new_mtime -ne $old_mtime ]; then
+	add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING
+    fi
 }
 
 update() {