From 29ba053e05b1a496500036dbd667002d1b8b5ec2 Mon Sep 17 00:00:00 2001
From: Matt Zimmerman <matt.zimmerman@canonical.com>
Date: Sun, 26 Jun 2005 21:30:27 +0000
Subject: Merge with mvo Patches applied:
* 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--fixes--0--patch-5
* merged with apt--main--0
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-7
* fixed incorrect man-page example
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-8
* changelog udpate
* 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
---
methods/connect.cc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'methods')
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;
--
cgit v1.2.3