From a551ca783486467f531a2e38ac3730826f1269bb Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 19 Dec 2010 09:57:18 -0800 Subject: paren_enclose: preserve atom USE conditionals The depgraph sometimes uses paren_enclose to temporarily convert parts of use_reduce output to a plain string. In these cases, we want to preserve atom USE conditionals, since these sometimes make a difference for IUSE checks during package matching (as in bug #348389). --- pym/_emerge/depgraph.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 4aec743b5..7e47a4604 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1188,7 +1188,8 @@ class depgraph(object): if not dep_string: continue - dep_string = portage.dep.paren_enclose(dep_string) + dep_string = portage.dep.paren_enclose(dep_string, + unevaluated_atom=True) if not self._add_pkg_dep_string( pkg, dep_root, dep_priority, dep_string, @@ -1465,7 +1466,8 @@ class depgraph(object): """ pkg, dep_root, dep_priority, dep_struct = \ self._dynamic_config._dep_disjunctive_stack.pop() - dep_string = portage.dep.paren_enclose(dep_struct) + dep_string = portage.dep.paren_enclose(dep_struct, + unevaluated_atom=True) if not self._add_pkg_dep_string( pkg, dep_root, dep_priority, dep_string, allow_unsatisfied): return 0 -- cgit v1.2.3-1-g7c22