summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-11-06 19:05:22 +0000
committerZac Medico <zmedico@gentoo.org>2006-11-06 19:05:22 +0000
commit7123514c5bda43457183326308dc14ded0d978d8 (patch)
tree2b0bcc8b75c2b88b4d4aaf42362c0f2bc3a311ee /bin
parent7b89c862dd424112b4a8cacae0ae5b41d9ef07a3 (diff)
downloadportage-7123514c5bda43457183326308dc14ded0d978d8.tar.gz
portage-7123514c5bda43457183326308dc14ded0d978d8.tar.bz2
portage-7123514c5bda43457183326308dc14ded0d978d8.zip
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
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge13
1 files changed, 9 insertions, 4 deletions
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 != "/":