diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-16 08:44:39 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-01-16 08:44:39 +0100 |
| commit | e08e66ca82147b72454964fdd624002f9b23290e (patch) | |
| tree | e9b455bb8ddaa4f89939661dc02ea9baef4845d5 /apt-pkg/depcache.cc | |
| parent | 6bfb4a2b25b576220e0c8bad1ba9479637667e19 (diff) | |
| parent | 85e1885525977809ff6a3b70abb84d3a63e41817 (diff) | |
merged from donkult
Diffstat (limited to 'apt-pkg/depcache.cc')
| -rw-r--r-- | apt-pkg/depcache.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 0f4715fad..7aaf1c61b 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -371,19 +371,10 @@ 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) { - if (Dep.IsNegative() == true) - { - /* 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) - continue; - // Implicit group-conflicts should not be applied on providers of other groups - if (Pkg->Group == Dep.TargetPkg()->Group && P.OwnerPkg()->Group != Pkg->Group) - continue; - } + if (Dep.IsIgnorable(P) == true) + continue; // Check if the provides is a hit if (Type == NowVersion) |