diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-13 17:35:44 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-13 17:35:44 +0100 |
| commit | 85e1885525977809ff6a3b70abb84d3a63e41817 (patch) | |
| tree | e985e74ed4d613126b24839d710e4b49db753824 /apt-pkg/depcache.cc | |
| parent | 14ea309a018d1604db45e29baeeb155cf6401c60 (diff) | |
| parent | 86fc2ca8909eb686e2ad751acb0f0eaf706d9d5e (diff) | |
merged from lp:~donkult/apt/experimental/
Diffstat (limited to 'apt-pkg/depcache.cc')
| -rw-r--r-- | apt-pkg/depcache.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 031fca5c0..085159711 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -371,14 +371,11 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) // Check the providing packages PrvIterator P = Dep.TargetPkg().ProvidesList(); - PkgIterator Pkg = Dep.ParentPkg(); for (; P.end() != true; ++P) { - /* Provides may never be applied against the same package (or group) - if it is a conflicts. See the comment above. */ - if (P.OwnerPkg()->Group == Pkg->Group && Dep.IsNegative() == true) + if (Dep.IsIgnorable(P) == true) continue; - + // Check if the provides is a hit if (Type == NowVersion) { |