summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcmdline/apt-key2
-rw-r--r--debian/changelog7
2 files changed, 8 insertions, 1 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 3514effad..f0b084448 100755
--- 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 a3805f962..d37cc6012 100644
--- 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: