Skip --newuse checks for nodes that have already been added to the graph as "merge...

svn path=/main/trunk/; revision=7671

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 1fda5ac0b415e375119eb588016366d72de782b5..991fa99925d2574d14e679a9e86a3037c2ad84d1 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1220,6 +1220,10 @@ class depgraph(object):
                                if "empty" not in self.myparams and vardbapi.cpv_exists(mykey):
                                        merging=0
 
+                       merge_node = (mytype, myroot, mykey, "merge")
+                       if self.digraph.contains(merge_node):
+                               merging = 1
+
                        """ If we aren't merging, perform the --newuse check.
                            If the package has new iuse flags or different use flags then if
                            --newuse is specified, we need to merge the package. """