From 131418cfb2b83fb725fff62b0401252fef5655e2 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 16 Mar 2010 21:47:49 +0100
Subject: apt-pkg/packagemanager.cc: more debug output for
 debug::pkgPackageManager

---
 apt-pkg/packagemanager.cc    | 5 +++++
 doc/examples/configure-index | 1 +
 2 files changed, 6 insertions(+)

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 491bff110..b747fa78a 100644
--- 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/doc/examples/configure-index b/doc/examples/configure-index
index 233fa2b7d..133ce8e79 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -409,6 +409,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
-- 
cgit v1.2.3


From 785b920b8c5b4e4a299c6bbfc919360529e0e6fc Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 14 Apr 2010 19:26:34 +0200
Subject: Remember hosts with general failures for
 https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831).

---
 debian/changelog   | 4 ++++
 methods/connect.cc | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6a078c498..896f850b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 apt (0.7.25.4) UNRELEASED; urgency=low
 
+  [ Evan Dandrea ]
+  * Remember hosts with general failures for
+    https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831).
+  
   [ Ivan Masár ]
   * Slovak translation update. Closes: #568294
   
diff --git a/methods/connect.cc b/methods/connect.cc
index adb16a199..2f6b4833e 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -116,6 +116,9 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
       errno = Err;
       if(errno == ECONNREFUSED)
          Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused");
+      else if (errno == ETIMEDOUT)
+	 Owner->SetFailExtraMsg("\nFailReason: 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);
    }
-- 
cgit v1.2.3