diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-07-25 20:03:51 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-07-25 20:03:51 +0200 |
| commit | 4faff53f166c1755a05d2509b44f22b1a326efb7 (patch) | |
| tree | efcab1a6382680108270a67313bac23718f75700 | |
| parent | 42e9340ee71ac781522e0ebf99b8d9c6bca2111f (diff) | |
* apt-pkg/depcache.cc:
- when checking for new important deps, skip critical ones
(closes: #485943)
| -rw-r--r-- | apt-pkg/depcache.cc | 5 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index d1bea4cf6..d8b4dc6d2 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -914,8 +914,9 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, { //FIXME: deal better with or-groups(?) DepIterator LocalStart = D; - - if(IsImportantDep(D) && Start.TargetPkg() == D.TargetPkg()) + + if(IsImportantDep(D) && !D.IsCritical() && + Start.TargetPkg() == D.TargetPkg()) { if(!isPreviouslySatisfiedImportantDep) { diff --git a/debian/changelog b/debian/changelog index 304875201..8bc57763b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,10 @@ apt (0.7.15) UNRELEASED; urgency=low (thanks to Arnaud Ebalard, closes: #485965) * add doc/examples/apt-https-method-example.cof (thanks to Arnaud Ebalard, closes: #485964) - + * apt-pkg/depcache.cc: + - when checking for new important deps, skip critical ones + (closes: #485943) + -- Christian Perrier <bubulle@debian.org> Sat, 14 Jun 2008 07:39:06 +0200 apt (0.7.14) unstable; urgency=low |