internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-14 12:51:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

need to handle the case where include_pattern and exclude_pattern exist in the config file but contain empty strings

Browse Source
This commit is contained in:
Michael Peters
2014-08-12 15:40:15 -04:00
parent ab6e1a43e9
commit 7194fe1064
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/inventory/ec2.py
View File

@@ -257,6 +257,8 @@ class Ec2Inventory(object):
pattern_include = config.get('ec2', 'pattern_include')
if pattern_include and len(pattern_include) > 0:
self.pattern_include = re.compile(pattern_include)
else
self.pattern_include = None
except ConfigParser.NoOptionError, e:
self.pattern_include = None
@@ -265,8 +267,10 @@ class Ec2Inventory(object):
pattern_exclude = config.get('ec2', 'pattern_exclude');
if pattern_exclude and len(pattern_exclude) > 0:
self.pattern_exclude = re.compile(pattern_exclude)
else
self.pattern_exclude = None
except ConfigParser.NoOptionError, e:
self.pattern_exclude = ''
self.pattern_exclude = None
def parse_cli_args(self):
''' Command line argument processing '''