Fixed up test dir WRT aliencode

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index 4d0cf985c22949b36f27d75fa2461a25dd99610d..e92eebe760bf3d8506a859880cb03c57b5fae01a 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: connect.cc,v 1.3 1999/07/18 23:06:56 jgg Exp $
+// $Id: connect.cc,v 1.5 2000/05/12 05:04:57 jgg Exp $
 /* ######################################################################
 
    Connect - Replacement connect call
@@ -115,10 +115,7 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
         if ((Res = getaddrinfo(Host.c_str(),S,&Hints,&LastHostAddr)) != 0 ||
             LastHostAddr == 0)
         {
-           if (Res == EAI_SERVICE)
-              return _error->Error("Could not resolve service '%s'",S);
-           
-           if (Res == EAI_NONAME)
+           if (Res == EAI_NONAME || Res == EAI_SERVICE)
            {
               if (DefPort != 0)
               {
@@ -164,6 +161,8 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
         _error->Discard();
    }
    
-   return false;
+   if (_error->PendingError() == true)
+      return false;
+   return _error->Error("Unable to connect to '%s'",Host.c_str());
 }
                                                                        /*}}}*/