diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-08-09 08:40:55 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-08-09 08:40:55 +0000 |
| commit | b19bc330d597d4b872ee9416ebeb9a86b9fc0763 (patch) | |
| tree | bb942fe32cc9466f21cc7863e6885fbcbfc3a943 /methods | |
| parent | 75ef8f14174f83a5f876a0d7414f4e6064a7d3e0 (diff) | |
| parent | 7aee90b638490036b8f4244dcb3d14ba0bc6dd8a (diff) | |
| download | apt-b19bc330d597d4b872ee9416ebeb9a86b9fc0763.tar.gz | |
* merged the apt--sane-handle-timeout--0 branch
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-87
* michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-1
* report timeouts (from Connect) and fail if they happen in pkgAcqMetaSig
* michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-2
* merged with the fixes branch to make it build again
* michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-3
* merged with main
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/connect.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/methods/connect.cc b/methods/connect.cc index 981ac1371..b85df6887 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -88,9 +88,11 @@ static bool DoConnect(struct addrinfo *Addr,string Host, /* This implements a timeout for connect by opening the connection nonblocking */ - if (WaitFd(Fd,true,TimeOut) == false) + if (WaitFd(Fd,true,TimeOut) == false) { + Owner->SetFailExtraMsg("\nFailReason: Timeout"); return _error->Error(_("Could not connect to %s:%s (%s), " "connection timed out"),Host.c_str(),Service,Name); + } // Check the socket for an error condition unsigned int Err; |