From: Sebastian Luther Date: Sun, 8 Aug 2010 19:10:22 +0000 (+0200) Subject: portage.dep.Atom.violated_conditionals(): Fix "not / is None" bug X-Git-Tag: v2.2_rc68~358 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bd33d7cf8ceea75a9a7635a326735d309ffe4613;p=portage.git portage.dep.Atom.violated_conditionals(): Fix "not / is None" bug --- 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)