From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 14 Apr 2010 17:26:34 +0000 (+0200)
Subject: Remember hosts with general failures for
X-Git-Tag: 0.7.25.3ubuntu7~1^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/785b920b8c5b4e4a299c6bbfc919360529e0e6fc

Remember hosts with general failures for
https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831).
---

diff --git a/debian/changelog b/debian/changelog
index 6a078c498..896f850b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 apt (0.7.25.4) UNRELEASED; urgency=low
 
+  [ Evan Dandrea ]
+  * Remember hosts with general failures for
+    https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831).
+  
   [ Ivan Masár ]
   * Slovak translation update. Closes: #568294
   
diff --git a/methods/connect.cc b/methods/connect.cc
index adb16a199..2f6b4833e 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -116,6 +116,9 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
       errno = Err;
       if(errno == ECONNREFUSED)
          Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused");
+      else if (errno == ETIMEDOUT)
+	 Owner->SetFailExtraMsg("\nFailReason: ConnectionTimedOut");
+      bad_addr.insert(bad_addr.begin(), string(Name));
       return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
 			   Service,Name);
    }