From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 16 Dec 2010 02:41:24 +0000 (-0800)
Subject: Atom.without_use: handle unevaluated_atom.use
X-Git-Tag: v2.1.9.26~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=718b66431a21ea7586de755de0327e4c95afcb37;p=portage.git

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.
---

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