diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-04-14 19:51:40 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-04-14 19:51:40 +0200 |
| commit | df3226c1b19b521e1945fb537379a26976552b62 (patch) | |
| tree | 2bdb956ff9066f7c00eecb42af2179b30179a8ce | |
| parent | b1fd12d41f9be5d5f33e4768761ed28f87953082 (diff) | |
| parent | 785b920b8c5b4e4a299c6bbfc919360529e0e6fc (diff) | |
merged from lp:~mvo/apt/mvo
| -rw-r--r-- | apt-pkg/packagemanager.cc | 5 | ||||
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | doc/examples/configure-index | 1 | ||||
| -rw-r--r-- | methods/connect.cc | 3 |
4 files changed, 22 insertions, 0 deletions
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/debian/changelog b/debian/changelog index 13d46cec9..0ce160295 100644 --- 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 1dd11a5b4..77fb8e0ed 100644 --- 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 ea3794e16..a5af1f1a6 100644 --- 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); } |