diff options
author | David Kalnischkies <kalnischkies@gmail.com> | 2011-06-29 19:21:34 +0200 |
---|---|---|
committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-06-29 19:21:34 +0200 |
commit | 8f8ed8f4e50fd98aa43ee69971cac8bda55760f1 (patch) | |
tree | 79dbb2f29aca55db49f8e7213094a8423caa343e /apt-pkg/orderlist.cc | |
parent | d953d210bb54accb416f2144104b79dcd29198ba (diff) | |
parent | 6f747894998e10649d0237fe5f7b9b85a5266f1f (diff) |
merge with debian-experimental 0.8.16~exp2 release
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) |