summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-21 04:19:03 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-21 04:19:03 +0000
commit12e4ce7cea8250e1c00ddc5b566f5e19afb76f13 (patch)
treed68592857e99a542201afef31eceb8ba05a91d74
parent8f3884d852303ce84922774309cacdfd35427009 (diff)
downloadportage-12e4ce7cea8250e1c00ddc5b566f5e19afb76f13.tar.gz
portage-12e4ce7cea8250e1c00ddc5b566f5e19afb76f13.tar.bz2
portage-12e4ce7cea8250e1c00ddc5b566f5e19afb76f13.zip
Add nodes to the fakedb in depgraph.create instead of depgraph.select_deps. It used to be in select_deps only for the case of packages that depend on themselves for bootstrap, but that hack isn't needed anymore because dep_check returns all deps now.
svn path=/main/trunk/; revision=4776
-rwxr-xr-xbin/emerge13
1 files changed, 5 insertions, 8 deletions
diff --git a/bin/emerge b/bin/emerge
index fb3d4604d..cf70742ca 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -875,7 +875,11 @@ class depgraph:
self.pkg_node_map[mybigkey[2]] = jbigkey
self.digraph.addnode(jbigkey, myparent,
priority=priority)
-
+
+ if addme:
+ myslot = mydbapi.aux_get(mykey, ["SLOT"])[0]
+ self.mydbapi[myroot].cpv_inject(mykey, myslot=myslot)
+
""" This section determines whether we go deeper into dependencies or not.
We want to go deeper on a few occasions:
Installing package A, we need to make sure package A's deps are met.
@@ -1203,13 +1207,6 @@ class depgraph:
p_type, p_root, p_key, p_status = myparent.split()
if p_status == "merge":
- """ This fakedbapi data is used in dep_check calls to determine
- satisfied deps via dep_wordreduce"""
- myslot = self.trees[p_root][
- self.pkg_tree_map[p_type]].dbapi.aux_get(
- p_key, ["SLOT"])[0]
- self.mydbapi[p_root].cpv_inject(p_key, myslot=myslot)
-
# Update old-style virtuals if this package provides any.
# These are needed for dep_virtual calls inside dep_check.
self.pkgsettings[p_root].setinst(p_key,