openstack
/
ceilometer
Code Issues Proposed changes

agent: use any to filter source objects 

Change-Id: Ic9105eae9fa72ea34ab336ec8439909553fc4d39
This commit is contained in:
Julien Danjou 2018-09-14 08:43:53 +02:00
parent be0f7e8b10
commit 7ed05f8b0e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometer/agent.py
View File

@ -124,13 +124,13 @@ class Source(object):
if not data:
raise SourceException('No %s specified' % d_type, self.cfg)
if ([x for x in data if x[0] not in '!*'] and
[x for x in data if x[0] == '!']):
if (any(x for x in data if x[0] not in '!*') and
any(x for x in data if x[0] == '!')):
raise SourceException(
'Both included and excluded %s specified' % d_type,
self.cfg)
if '*' in data and [x for x in data if x[0] not in '!*']:
if '*' in data and any(x for x in data if x[0] not in '!*'):
raise SourceException(
'Included %s specified with wildcard' % d_type,
self.cfg)