merged from lp:~mvo/apt/mvo

apt-pkg/packagemanager.cc

@@ -338,6 +338,9 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
       return true;
    if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == false)
       return false;
+
+   if (Debug) 
+      std::clog << OutputInDepth(Depth) << "DepAdd: " << Pkg.Name() << std::endl;
       
    // Put the package on the list
    OList.push_back(Pkg);
@@ -391,6 +394,8 @@ bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
       
       if (Bad == true)
       {
+	 if (Debug) 
+	    std::clog << OutputInDepth(Depth) << "DepAdd FAILS on: " << Pkg.Name() << std::endl;
 	 OList.Flag(Pkg,0,pkgOrderList::Added);
 	 OList.pop_back();
 	 Depth--;

debian/changelog

@@ -1,3 +1,16 @@
+apt (0.7.25.3ubuntu7) UNRELEASEDlucid; urgency=low
+
+  Cherry pick fixes from the lp:~mvo/apt/mvo branch:
+
+  [ Evan Dandrea ]
+  * Remember hosts with general failures for
+    https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831).
+  
+  [ Michael Vogt ]
+  * improve debug output for Debug::pkgPackageManager
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Apr 2010 19:29:03 +0200
+
 apt (0.7.25.3ubuntu6) lucid; urgency=low
 
   * cmdline/apt-get.cc:

doc/examples/configure-index

@@ -424,6 +424,7 @@ Debug
   pkgDPkgPM "false";
   pkgDPkgProgressReporting "false";
   pkgOrderList "false";
+  pkgPackageManager "false"; // OrderList/Configure debugging
   pkgAutoRemove "false";   // show information about automatic removes
   BuildDeps "false";
   pkgInitialize "false";   // This one will dump the configuration space

methods/connect.cc

@@ -115,6 +115,9 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
       errno = Err;
       if(errno == ECONNREFUSED)
          Owner->SetFailReason("ConnectionRefused");
+      else if (errno == ETIMEDOUT)
+	 Owner->SetFailReason("ConnectionTimedOut");
+      bad_addr.insert(bad_addr.begin(), string(Name));
       return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
 			   Service,Name);
    }