Generate the depgraph.args_keys list _before_ building the graph.
authorZac Medico <zmedico@gentoo.org>
Sun, 8 Oct 2006 23:35:04 +0000 (23:35 -0000)
committerZac Medico <zmedico@gentoo.org>
Sun, 8 Oct 2006 23:35:04 +0000 (23:35 -0000)
svn path=/main/trunk/; revision=4628

bin/emerge

index ab6d4b52e89f9114b5825cef3d4ca479a1bf267b..691f707223e82a2a49d9996805de8562fa65d638 100755 (executable)
@@ -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: