From 7123514c5bda43457183326308dc14ded0d978d8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 6 Nov 2006 19:05:22 +0000 Subject: For bug #154223, bridge new-style virtuals into old-style virtuals in order to prevent old-style virtuals from making new-style virtuals invisible. svn path=/main/trunk/; revision=4955 --- bin/emerge | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index e6db286ed..4cdab4b84 100755 --- a/bin/emerge +++ b/bin/emerge @@ -721,10 +721,15 @@ class depgraph: self.edebug = 1 self.spinner = spinner self.pkgsettings = {} - self.pkgsettings[self.target_root] = portage.config(clone=settings) - if self.target_root != "/": - self.pkgsettings["/"] = \ - portage.config(clone=trees["/"]["vartree"].settings) + for myroot in self.trees: + self.pkgsettings[myroot] = portage.config( + clone=trees[myroot]["vartree"].settings) + mydbapis = [] + if "--usepkgonly" not in self.myopts: + mydbapis.append(trees[myroot]["porttree"].dbapi) + if "--usepkg" in self.myopts: + mydbapis.append(trees[myroot]["bintree"].dbapi) + self.pkgsettings[myroot].add_new_virtuals(mydbapis) self.useFlags = {} self.useFlags[self.target_root] = {} if self.target_root != "/": -- cgit v1.2.3-1-g7c22