summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-08 23:35:04 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-08 23:35:04 +0000
commit10e7e25f612f78e980d45313318d33f8c8206f69 (patch)
treee75233294c18505cbbab3f01d4ce037600348d40
parenta8b0826945aefb20763549789ba5fb0d56a9b906 (diff)
downloadportage-10e7e25f612f78e980d45313318d33f8c8206f69.tar.gz
portage-10e7e25f612f78e980d45313318d33f8c8206f69.tar.bz2
portage-10e7e25f612f78e980d45313318d33f8c8206f69.zip
Generate the depgraph.args_keys list _before_ building the graph.
svn path=/main/trunk/; revision=4628
-rwxr-xr-xbin/emerge5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index ab6d4b52e..691f70722 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -974,9 +974,10 @@ class depgraph:
greedy_atoms.append((myarg, myslot_atom))
arg_atoms = greedy_atoms
- self.args_keys = []
+ """ These are used inside self.create() in order to ensure packages
+ that happen to match arguments are not incorrectly marked as nomerge."""
+ self.args_keys = [x[1] for x in arg_atoms]
for myarg, myatom in arg_atoms:
- self.args_keys.append(myatom)
try:
self.mysd = self.select_dep(myroot, myatom, arg=myarg)
except portage_exception.MissingSignature, e: