Merge pull request #3082 from pol/devel

Handle '#' in var strings by splitting on ' #'
pull/2953/merge
Michael DeHaan 12 years ago
commit ee6ea97435

@ -65,7 +65,7 @@ class InventoryParser(object):
for line in self.lines:
if line.startswith("["):
active_group_name = line.split("#")[0].replace("[","").replace("]","").strip()
active_group_name = line.split(" #")[0].replace("[","").replace("]","").strip()
if line.find(":vars") != -1 or line.find(":children") != -1:
active_group_name = active_group_name.rsplit(":", 1)[0]
if active_group_name not in self.groups:
@ -78,7 +78,7 @@ class InventoryParser(object):
elif line.startswith("#") or line == '':
pass
elif active_group_name:
tokens = shlex.split(line.split("#")[0])
tokens = shlex.split(line.split(" #")[0])
if len(tokens) == 0:
continue
hostname = tokens[0]

@ -302,4 +302,4 @@ class TestInventory(unittest.TestCase):
assert vars == {'inventory_hostname': 'zeus',
'inventory_hostname_short': 'zeus',
'group_names': ['greek', 'major-god', 'ungrouped'],
'var_a': '1'}
'var_a': '1#2'}

@ -1,5 +1,5 @@
[major-god] # group with inline comments
zeus var_a=1 # host with inline comments
zeus var_a="1#2" # host with inline comments and "#" in the var string
# A comment
thor

Loading…
Cancel
Save