summaryrefslogtreecommitdiff
path: root/methods/connect.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-06-28 12:31:17 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-06-28 12:31:17 +0000
commit254ce4b0cc0336de5a9b46c693673ef68d5628b6 (patch)
tree180d7b122cc5ab1b8a9625ed873f83e7fdb104f4 /methods/connect.cc
parentbe65f52793235fa0419af5bb6c867da28506c227 (diff)
parent29ba053e05b1a496500036dbd667002d1b8b5ec2 (diff)
* merged with apt--ubuntu--0
Patches applied: * apt@packages.debian.org/apt--ubuntu--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-88 * apt@packages.debian.org/apt--ubuntu--0--patch-1 Merge from Debian branch * apt@packages.debian.org/apt--ubuntu--0--patch-2 0.6.38ubuntu1 * apt@packages.debian.org/apt--ubuntu--0--patch-3 Merge with mainline * apt@packages.debian.org/apt--ubuntu--0--patch-4 Improved arch-build rule * apt@packages.debian.org/apt--ubuntu--0--patch-5 Merge with mainline * apt@packages.debian.org/apt--ubuntu--0--patch-6 Merge with mvo * michael.vogt@ubuntu.com--2005/apt--bts225947--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-1 * merged with mainline and apt--fixes--0 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-2 * patch from aj (slighly modified to use auto_ptr<>) applied * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-3 * changelog updated * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-4 * work for arch=all packages too now * 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--ubuntu--0--patch-1 tag of apt@packages.debian.org/apt--main--0--patch-88 * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-2 * merged apt--mvo (to make pining on components work again) * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-3 * merged with apt--fixes--0 (to make the building of the french manpages work and to fix a incorrect man-page example * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-4 * merged with the bts225947 code * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-5 * merged the imporoved timoeut handling patch * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-6 * merged with matt * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-7 * removed another conflict with apt--main
Diffstat (limited to 'methods/connect.cc')
-rw-r--r--methods/connect.cc4
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;