From bd33d7cf8ceea75a9a7635a326735d309ffe4613 Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Sun, 8 Aug 2010 21:10:22 +0200 Subject: [PATCH] portage.dep.Atom.violated_conditionals(): Fix "not / is None" bug --- pym/portage/dep/__init__.py | 4 ++-- 1 file 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) -- 2.26.2