diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-06-29 16:29:54 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-06-29 16:29:54 +0200 |
| commit | a9d2fdce1f1d5b4b428c215189a5b204ff91108b (patch) | |
| tree | 87870e8f3c6c66653dabe165fde5cc78a8b337e4 /apt-pkg/orderlist.cc | |
| parent | aaa7858c3583617b068bd87af4e17be4d02da0bf (diff) | |
| parent | e449f717078978396b76a2fdae844196888d0211 (diff) | |
merge with debian-sid release 0.8.15
Diffstat (limited to 'apt-pkg/orderlist.cc')
| -rw-r--r-- | apt-pkg/orderlist.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index ba43bc757..19661fc2d 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -1073,6 +1073,12 @@ bool pkgOrderList::CheckDep(DepIterator D) just needs one */ if (D.IsNegative() == false) { + // ignore provides by older versions of this package + if (((D.Reverse() == false && Pkg == D.ParentPkg()) || + (D.Reverse() == true && Pkg == D.TargetPkg())) && + Cache[Pkg].InstallVer != *I) + continue; + /* Try to find something that does not have the after flag set if at all possible */ if (IsFlag(Pkg,After) == true) |