From 93886541b35bf232e2a03eca01e39ddea2137111 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 13 Feb 2008 15:22:30 +0100
Subject: cmdline/apt-key: make net-update more robust

---
 cmdline/apt-key | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/cmdline/apt-key b/cmdline/apt-key
index bbf3a7697..b65c01f71 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -61,8 +61,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() {
-- 
cgit v1.2.3