summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Luther <SebastianLuther@gmx.de>2010-08-08 21:10:22 +0200
committerZac Medico <zmedico@gentoo.org>2010-08-08 17:34:35 -0700
commitbd33d7cf8ceea75a9a7635a326735d309ffe4613 (patch)
tree5f7e30329605a90f939c001fac8b140c203d4c8a
parentfef6bc0af3f527ded24fd82465383f363865e4b6 (diff)
downloadportage-bd33d7cf8ceea75a9a7635a326735d309ffe4613.tar.gz
portage-bd33d7cf8ceea75a9a7635a326735d309ffe4613.tar.bz2
portage-bd33d7cf8ceea75a9a7635a326735d309ffe4613.zip
portage.dep.Atom.violated_conditionals(): Fix "not / is None" bug
-rw-r--r--pym/portage/dep/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 0ee52218d..542c17680 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -519,9 +519,9 @@ class _use_dep(object):
tokens.extend(x for x in self.enabled if x not in other_use)
tokens.extend("-" + x for x in self.disabled if x in other_use)
if conditional:
- if not parent_use:
+ if parent_use is None:
raise InvalidAtom("violated_conditionals needs 'parent_use'" + \
- " parameter for conditional flags: '%s'" % (token,))
+ " parameter for conditional flags.")
tokens.extend(x + "?" for x in conditional.enabled if x in parent_use and not x in other_use)
tokens.extend("!" + x + "?" for x in conditional.disabled if x not in parent_use and x in other_use)
tokens.extend(x + "=" for x in conditional.equal if x in parent_use and x not in other_use)