summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-12-15 18:41:24 -0800
committerZac Medico <zmedico@gentoo.org>2010-12-15 18:41:24 -0800
commit7be2f4b8db7c4194df6541f27118a57f1e006f0c (patch)
treead34a7957b474bf4024866b1a1d752a780705460
parentf7cdf7b46f28c09d3da92a45d691a3070b8a3dcc (diff)
downloadportage-7be2f4b8db7c4194df6541f27118a57f1e006f0c.tar.gz
portage-7be2f4b8db7c4194df6541f27118a57f1e006f0c.tar.bz2
portage-7be2f4b8db7c4194df6541f27118a57f1e006f0c.zip
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.
-rw-r--r--pym/portage/dep/__init__.py9
1 files changed, 8 insertions, 1 deletions
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