ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-23 05:10:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't accept undocumented "p1;p2" patterns; note in changelog

Browse source 
The correct (and now only) way to say p1 OR p2 is "p1:p2".
This commit is contained in:
Abhijit Menon-Sen 2015-08-13 17:21:53 +05:30 • committed by James Cammarata
commit eff33bac49
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/inventory/__init__.py
View file

@ -178,10 +178,11 @@ class Inventory(object):
applied subsets.
"""
# process patterns
# Enumerate all hosts matching the given pattern (which may be
# either a list of patterns or a string like 'pat1:pat2').
if isinstance(pattern, list):
pattern = ';'.join(pattern)
patterns = self._split_pattern(pattern.replace(";",":"))
pattern = ':'.join(pattern)
patterns = self._split_pattern(pattern)
hosts = self._get_hosts(patterns)
# exclude hosts not in a subset, if defined
@ -520,8 +521,7 @@ class Inventory(object):
if subset_pattern is None:
self._subset = None
else:
subset_pattern = subset_pattern.replace(',',':')
subset_patterns = self._split_pattern(subset_pattern.replace(";",":"))
subset_patterns = self._split_pattern(subset_pattern)
results = []
# allow Unix style @filename data
for x in subset_patterns: