diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-17 11:27:50 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-17 11:27:50 +0200 |
| commit | 01380ef62a453e44613dba87086177162a52c5fa (patch) | |
| tree | 4b69db9e0e7081f338be79ac807bc07eed633dd8 /apt-pkg | |
| parent | bb3e64527b0c1ccf3f31a5a56c21819e25f128ae (diff) | |
| parent | d95dbc2ffd4acd5776ae6de300be320ef459325e (diff) | |
merged lp:~donkult/apt/sid
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/packagemanager.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/pkgcache.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index a3ba26f7c..db18c5521 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -598,7 +598,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate) for (PrvIterator P = instVer.ProvidesList(); P.end() == false; ++P) - CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion()); + if (Pkg->Group != P.OwnerPkg()->Group) + CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion()); List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index faccafbef..07d85377d 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -637,7 +637,7 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() const continue; if (IsNegative() == true && - ParentPkg() == I.OwnerPkg()) + ParentPkg()->Group == I.OwnerPkg()->Group) continue; Size++; |