merged from lp:~mvo/apt/mvo

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 491bff110b8938dd55d80427b673ac4848f32b8d..b747fa78a7b4904e945f2c26570df72b964b6e55 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/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--;

diff --git a/debian/changelog b/debian/changelog
index 13d46cec95a5ba3940dce1e6550aa9b91949f2b7..0ce1602956ed8b7abbf7e89430a799315fdfe5ed 100644 (file)
--- a/debian/changelog
+++ b/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:

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 1dd11a5b423be1705ee6c8728cc74be58b00bc1c..77fb8e0ed352d1f55c567cf3292a664834862b64 100644 (file)
--- a/doc/examples/configure-index
+++ b/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

diff --git a/methods/connect.cc b/methods/connect.cc
index ea3794e16548054e5f6b1c989b46091a2354c64b..a5af1f1a68f094d929d4748405e00bd49c3b6bbe 100644 (file)
--- a/methods/connect.cc
+++ b/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);
    }