summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
Diffstat (limited to 'methods')
-rw-r--r--methods/ftp.cc11
-rw-r--r--methods/http.cc10
2 files changed, 13 insertions, 8 deletions
diff --git a/methods/ftp.cc b/methods/ftp.cc
index ff9dac221..efc50c205 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: ftp.cc,v 1.11 1999/05/27 05:51:18 jgg Exp $
+// $Id: ftp.cc,v 1.12 1999/05/28 07:04:45 jgg Exp $
/* ######################################################################
HTTP Aquire Method - This is the FTP aquire method for APT.
@@ -173,19 +173,21 @@ bool FTPConn::Open(pkgAcqMethod *Owner)
SetNonBlock(ServerFd,true);
if (connect(ServerFd,LastHostAddr->ai_addr,LastHostAddr->ai_addrlen) < 0 &&
errno != EINPROGRESS)
- return _error->Errno("connect","Connect initiate the connection");
+ return _error->Errno("connect","Cannot initiate the connection "
+ "to %s (%s).",Host.c_str(),Name);
Peer = *((struct sockaddr_in *)LastHostAddr->ai_addr);
/* This implements a timeout for connect by opening the connection
nonblocking */
if (WaitFd(ServerFd,true,TimeOut) == false)
- return _error->Error("Could not connect, connection timed out");
+ return _error->Error("Could not connect to %s (%s), "
+ "connection timed out",Host.c_str(),Name);
unsigned int Err;
unsigned int Len = sizeof(Err);
if (getsockopt(ServerFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
return _error->Errno("getsockopt","Failed");
if (Err != 0)
- return _error->Error("Could not connect.");
+ return _error->Error("Could not connect to %s (%s).",Host.c_str(),Name);
Owner->Status("Logging in");
return Login();
@@ -846,6 +848,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
// Could not connect is a transient error..
if (Server->Open(this) == false)
{
+ Server->Close();
Fail(true);
return true;
}
diff --git a/methods/http.cc b/methods/http.cc
index 067d80564..4e659ccd6 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: http.cc,v 1.32 1999/05/26 04:08:39 jgg Exp $
+// $Id: http.cc,v 1.33 1999/05/28 07:04:45 jgg Exp $
/* ######################################################################
HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -353,18 +353,20 @@ bool ServerState::Open()
SetNonBlock(ServerFd,true);
if (connect(ServerFd,LastHostAddr->ai_addr,LastHostAddr->ai_addrlen) < 0 &&
errno != EINPROGRESS)
- return _error->Errno("connect","Connect initiate the connection");
+ return _error->Errno("connect","Cannot initiate the connection "
+ "to %s (%s).",Host.c_str(),Name);
/* This implements a timeout for connect by opening the connection
nonblocking */
if (WaitFd(ServerFd,true,TimeOut) == false)
- return _error->Error("Could not connect, connection timed out");
+ return _error->Error("Could not connect to %s (%s), "
+ "connection timed out",Host.c_str(),Name);
unsigned int Err;
unsigned int Len = sizeof(Err);
if (getsockopt(ServerFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
return _error->Errno("getsockopt","Failed");
if (Err != 0)
- return _error->Error("Could not connect.");
+ return _error->Error("Could not connect to %s (%s).",Host.c_str(),Name);
return true;
}