summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-05 03:41:50 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-05 03:41:50 +0000
commit918cc3a99d3197c496b28dd7335203193c16c8df (patch)
tree686611025e2eddad28a102fc78e7213d44e5f478
parent1a51b31719549f1b0b2cce421fc6e927721274da (diff)
downloadportage-918cc3a99d3197c496b28dd7335203193c16c8df.tar.gz
portage-918cc3a99d3197c496b28dd7335203193c16c8df.tar.bz2
portage-918cc3a99d3197c496b28dd7335203193c16c8df.zip
Match blockers against the correct $ROOT for bug #108449.
svn path=/main/trunk/; revision=3787
-rwxr-xr-xbin/emerge10
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge
index 610ec50f8..f0895592e 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -684,10 +684,12 @@ class depgraph:
""" We ignore blocks unless the package that is blocked is installed
We need to check vardbapi as well as the current depgraph for it.
Blocks are fatal if buildpkgonly is set. """
- if addme and "--buildpkgonly" not in self.myopts and myparent and \
- (self.mydbapi[myroot].match(mykey) or vardbapi.match(mykey)):
- mybigkey.append(myparent.split()[2])
- self.digraph.addnode(string.join(mybigkey),myparent)
+ if addme and "--buildpkgonly" not in self.myopts and myparent:
+ parent_root = myparent.split()[1]
+ if self.mydbapi[parent_root].match(mykey) or \
+ self.trees[parent_root]["vartree"].dbapi.match(mykey):
+ mybigkey.append(myparent.split()[2])
+ self.digraph.addnode(" ".join(mybigkey), myparent)
return 1
if myuse is None: