From 918cc3a99d3197c496b28dd7335203193c16c8df Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 5 Jul 2006 03:41:50 +0000 Subject: Match blockers against the correct $ROOT for bug #108449. svn path=/main/trunk/; revision=3787 --- bin/emerge | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'bin') 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: -- cgit v1.2.3-1-g7c22