diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-06-28 17:53:16 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-06-28 17:53:16 +0100 |
commit | 58d4a28e10d689ccbf3087c870be0fc2d2a37ee1 (patch) | |
tree | c54a790dd7bef66c08427e428e015ba389f0d365 /apt-pkg/orderlist.cc | |
parent | 6f6e2494c6e54b837942c331e5763c6c1d8ced06 (diff) | |
parent | 1fc8c9229ab6272ff7422af36ecfbc7a21376544 (diff) |
merged from debian-sid
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) |