diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-08-22 22:09:18 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-08-22 22:09:18 +0000 |
| commit | ddcfd87d2b5ddb6592cee6c41a618f18d9931c2f (patch) | |
| tree | 4ea77f351a89199b2d9a9236eb39e0669af6efff | |
| parent | ee295b597c4425b2cf757fb94175960ba843fcb4 (diff) | |
| download | portage-ddcfd87d2b5ddb6592cee6c41a618f18d9931c2f.tar.gz portage-ddcfd87d2b5ddb6592cee6c41a618f18d9931c2f.tar.bz2 portage-ddcfd87d2b5ddb6592cee6c41a618f18d9931c2f.zip | |
Skip --newuse checks for nodes that have already been added to the graph as "merge" nodes.
svn path=/main/trunk/; revision=7671
| -rw-r--r-- | pym/emerge/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
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. """ |