summaryrefslogtreecommitdiff
path: root/apt-pkg/depcache.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-05-05 11:03:16 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2008-05-05 11:03:16 +0200
commit549da1a850f0fd50e0a55415452ecaa735d49451 (patch)
tree312bc5525fc98d2c25780e3479b7223044596388 /apt-pkg/depcache.cc
parent1171258afb052c3ddcb4e5dc3f19b4ec1b29e4b9 (diff)
parent8f6aa8efa522c90959fb827a8618f02f41e0a2cd (diff)
* Mark a message from dselect backend as translatable
Thanks to Frédéric Bothamy for the patch Closes: #322470 * Simplified Chinese updated. Closes: #473360 * Catalan fixes. Closes: #387141 * Typo fix in Greek translation. Closes: #479122 * French updated. * Thai updated. Closes: #479313 * Italian updated. Closes: #479326 * Polish updated. Closes: #479342 * Bulgarian updated. Closes: #479379 * Finnish updated. Closes: #479403 * Korean updated. Closes: #479426 * Basque updated. Closes: #479452 * Add missing build-depends back from build-depends-indep field. Closes: #478231 * Make cron script quiet if cache is locked. Thanks to Ted Percival <ted@midg3t.net> for the patch. Closes: #459344 * Add timeout support for https. Thanks to Andrew Martens <andrew.martens@strangeloopnetworks.com> for the patch. * Add support for --no-download on apt-get update. Closes: #478517 - Vietnamese updated. Closes: #479008 - Enable more complete debugging information when Debug::pkgAutoRemove is set. * debian/rules: - Add missing Build-Depends-Indep on xsltproc, docbook-xsl, and xmlto.
Diffstat (limited to 'apt-pkg/depcache.cc')
-rw-r--r--apt-pkg/depcache.cc45
1 files changed, 43 insertions, 2 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index ee9f0da05..d1bea4cf6 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1305,7 +1305,7 @@ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc)
{
// the package is installed (and set to keep)
if(PkgState[p->ID].Keep() && !p.CurrentVer().end())
- MarkPackage(p, p.CurrentVer(),
+ MarkPackage(p, p.CurrentVer(),
follow_recommends, follow_suggests);
// the package is to be installed
else if(PkgState[p->ID].Install())
@@ -1356,7 +1356,18 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
if(state.Marked)
return;
- //std::cout << "Setting Marked for: " << pkg.Name() << std::endl;
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ {
+ std::clog << "Marking: " << pkg.Name();
+ if(!ver.end())
+ std::clog << " " << ver.VerStr();
+ if(!currver.end())
+ std::clog << ", Curr=" << currver.VerStr();
+ if(!instver.end())
+ std::clog << ", Inst=" << instver.VerStr();
+ std::clog << std::endl;
+ }
+
state.Marked=true;
if(!ver.end())
@@ -1376,6 +1387,19 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
{
if(_system->VS->CheckDep(V.VerStr(), d->CompareOp, d.TargetVer()))
{
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ {
+ std::clog << "Following dep: " << d.ParentPkg().Name()
+ << " " << d.ParentVer().VerStr() << " "
+ << d.DepType() << " "
+ << d.TargetPkg().Name();
+ if((d->CompareOp & ~pkgCache::Dep::Or) != pkgCache::Dep::NoOp)
+ {
+ std::clog << " (" << d.CompType() << " "
+ << d.TargetVer() << ")";
+ }
+ std::clog << std::endl;
+ }
MarkPackage(V.ParentPkg(), V,
follow_recommends, follow_suggests);
}
@@ -1387,6 +1411,23 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
if(_system->VS->CheckDep(prv.ProvideVersion(), d->CompareOp,
d.TargetVer()))
{
+ if(_config->FindB("Debug::pkgAutoRemove",false))
+ {
+ std::clog << "Following dep: " << d.ParentPkg().Name()
+ << " " << d.ParentVer().VerStr() << " "
+ << d.DepType() << " "
+ << d.TargetPkg().Name();
+ if((d->CompareOp & ~pkgCache::Dep::Or) != pkgCache::Dep::NoOp)
+ {
+ std::clog << " (" << d.CompType() << " "
+ << d.TargetVer() << ")";
+ }
+ std::clog << ", provided by "
+ << prv.OwnerPkg().Name() << " "
+ << prv.OwnerVer().VerStr()
+ << std::endl;
+ }
+
MarkPackage(prv.OwnerPkg(), prv.OwnerVer(),
follow_recommends, follow_suggests);
}