From 718b66431a21ea7586de755de0327e4c95afcb37 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 15 Dec 2010 18:41:24 -0800 Subject: Atom.without_use: handle unevaluated_atom.use Atom.unevaluated_atom.use is used for IUSE checks when matching packages, so it must not propagate to Atom.without_use. --- pym/portage/dep/__init__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 1f956e39b..52009fea3 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -1134,7 +1134,14 @@ class Atom(_atom_base): without_use = Atom(m.group('without_use'), allow_repo=allow_repo) else: use = None - without_use = self + if unevaluated_atom is not None and \ + unevaluated_atom.use is not None: + # unevaluated_atom.use is used for IUSE checks when matching + # packages, so it must not propagate to without_use + without_use = Atom(s, allow_wildcard=allow_wildcard, + allow_repo=allow_repo) + else: + without_use = self self.__dict__['use'] = use self.__dict__['without_use'] = without_use -- cgit v1.2.3-1-g7c22