ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

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
parent 1437b8e120
commit d41db8edd6
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -533,12 +533,16 @@ class Inventory(object):
if subset_pattern is None: if subset_pattern is None:
self._subset = None self._subset = None
else: else:
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
subset_patterns = self._split_pattern(subset_pattern) subset_patterns = self._split_pattern(subset_pattern)
======= =======
subset_pattern = subset_pattern.replace(',',':') subset_pattern = subset_pattern.replace(',',':')
subset_patterns = self._split_pattern(subset_pattern.replace(";",":")) subset_patterns = self._split_pattern(subset_pattern.replace(";",":"))
>>>>>>> Introduce _split_pattern to parse an "x:y:z" pattern >>>>>>> Introduce _split_pattern to parse an "x:y:z" pattern
=======
subset_patterns = self._split_pattern(subset_pattern)
>>>>>>> Don't accept undocumented "p1;p2" patterns; note in changelog
results = [] results = []
# allow Unix style @filename data # allow Unix style @filename data
for x in subset_patterns: for x in subset_patterns: