* cmdline/apt-key:

  - set timeout of wget for net-update to 90 seconds (thanks to \sh)

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 3514effadb7eacc408a17530eacc6128b908e5cc..f0b084448d3fa574e15a046a64fd93cf652cdcda 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -71,7 +71,7 @@ net_update() {
     if [ -e $keyring ]; then
        old_mtime=$(stat -c %Y $keyring)
     fi
-    (cd  /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI)
+    (cd  /var/lib/apt/keyrings; wget --timeout=90 -q -N $ARCHIVE_KEYRING_URI)
     if [ ! -e $keyring ]; then
        return
     fi

diff --git a/debian/changelog b/debian/changelog
index a3805f962cccc6e63c6f9631eba88e1bba59936e..d37cc60129ed40c2c6ed6608fad66eeeab83f31d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.8.9ubuntu4) UNRELEASED; urgency=low
+
+  * cmdline/apt-key:
+    - set timeout of wget for net-update to 90 seconds (thanks to \sh)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 22 Nov 2010 18:15:09 +0100
+
 apt (0.8.9ubuntu3) natty; urgency=low
 
   * methods/http.cc: