summaryrefslogtreecommitdiff
path: root/apt-pkg/packagemanager.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-08-17 11:27:50 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-08-17 11:27:50 +0200
commit01380ef62a453e44613dba87086177162a52c5fa (patch)
tree4b69db9e0e7081f338be79ac807bc07eed633dd8 /apt-pkg/packagemanager.cc
parentbb3e64527b0c1ccf3f31a5a56c21819e25f128ae (diff)
parentd95dbc2ffd4acd5776ae6de300be320ef459325e (diff)
merged lp:~donkult/apt/sid
Diffstat (limited to 'apt-pkg/packagemanager.cc')
-rw-r--r--apt-pkg/packagemanager.cc3
1 files changed, 2 insertions, 1 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);