diff options
| -rw-r--r-- | apt-pkg/algorithms.cc | 12 | ||||
| -rw-r--r-- | apt-pkg/depcache.cc | 13 | ||||
| -rw-r--r-- | debian/changelog | 11 |
3 files changed, 28 insertions, 8 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index d19783983..85799a11b 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -845,8 +845,10 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) } while (Again == true); - if (Debug == true) - clog << "Starting" << endl; + if (Debug == true) { + clog << "Starting pkgProblemResolver with broken count: " + << Cache.BrokenCount() << endl; + } MakeScores(); @@ -874,8 +876,10 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix) } } - if (Debug == true) - clog << "Starting 2" << endl; + if (Debug == true) { + clog << "Starting 2 pkgProblemResolver with broken count: " + << Cache.BrokenCount() << endl; + } /* Now consider all broken packages. For each broken package we either remove the package or fix it's problem. We do this once, it should diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 5bed10d95..9f8422fec 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1251,9 +1251,16 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, PkgState[Pkg->ID].CandidateVer != *I && MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps) == true) continue; - else if ((Start->Type == pkgCache::Dep::Conflicts || Start->Type == pkgCache::Dep::DpkgBreaks) && - MarkDelete(Pkg,false,Depth + 1, false) == false) - break; + else if (Start->Type == pkgCache::Dep::Conflicts || + Start->Type == pkgCache::Dep::DpkgBreaks) + { + if(DebugAutoInstall == true) + std::clog << OutputInDepth(Depth) + << " Removing: " << Pkg.Name() + << std::endl; + if (MarkDelete(Pkg,false,Depth + 1, false) == false) + break; + } } continue; } diff --git a/debian/changelog b/debian/changelog index bd25df1e2..4baa4d18d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,8 @@ -apt (0.9.8.3) UNRELEASED; urgency=low +apt (0.9.9) unstable; urgency=low + + [ Michael Vogt ] + * improve debug output for the Debug::pkgProblemResolver and + Debug::pkgDepCache::AutoInstall [ David Kalnischkies ] * build the en manpages in subdirectory doc/en @@ -43,6 +47,11 @@ apt (0.9.8.2) unstable; urgency=low * Fix crash when the "mirror" method does not find any entry (closes: #699303) + [ Johan Kiviniemi ] + * cmdline/apt-key: + - Create new keyrings with mode 0644 instead of 0600. + - Accept a nonexistent --keyring file with the adv subcommand as well. + -- Michael Vogt <mvo@debian.org> Thu, 06 Jun 2013 19:15:14 +0200 apt (0.9.8.1) unstable; urgency=low |