summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--methods/connect.cc3
2 files changed, 7 insertions, 0 deletions
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);
}