diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-06-29 11:15:35 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-06-29 11:15:35 +0100 |
commit | ab30a600527ba467cda6474c3ab09d64fcbfacd6 (patch) | |
tree | 4d579c3e3abd25d65344373ddf30e923cf5e4862 /apt-pkg/orderlist.cc | |
parent | 9c76a88155c346666325339c5581a528d70b1f69 (diff) | |
parent | e449f717078978396b76a2fdae844196888d0211 (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) |