diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2011-07-02 15:33:25 +0100 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2011-07-02 15:33:25 +0100 |
| commit | cfcdf7fe9f8c925847fe8d8a18bb0996dd9391a5 (patch) | |
| tree | f205095c1b7d9df6c496b100ed11d454b576c294 /apt-pkg/orderlist.cc | |
| parent | b873565f6cdffee78d3a5a84d34b7efbda127c5b (diff) | |
The modification to orderlist.cc is from a patch DonKult (David) gave me, The modifications to the packagemanager should fix the test-provides-gone-with-upgrade testcase.
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..6dd494027 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) |