From ddcfd87d2b5ddb6592cee6c41a618f18d9931c2f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 22 Aug 2007 22:09:18 +0000 Subject: [PATCH] Skip --newuse checks for nodes that have already been added to the graph as "merge" nodes. svn path=/main/trunk/; revision=7671 --- pym/emerge/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 1fda5ac0b..991fa9992 100644 --- 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. """ -- 2.26.2