Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
ba78360c
Commit
ba78360c
authored
May 30, 2013
by
Pol Llovet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove inline comments from inventory tokenizing.
parent
ad1a02aa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
lib/ansible/inventory/ini.py
+2
-2
test/inventory_dir/3comments
+8
-0
No files found.
lib/ansible/inventory/ini.py
View file @
ba78360c
...
@@ -65,7 +65,7 @@ class InventoryParser(object):
...
@@ -65,7 +65,7 @@ class InventoryParser(object):
for
line
in
self
.
lines
:
for
line
in
self
.
lines
:
if
line
.
startswith
(
"["
):
if
line
.
startswith
(
"["
):
active_group_name
=
line
.
replace
(
"["
,
""
)
.
replace
(
"]"
,
""
)
.
strip
()
active_group_name
=
line
.
split
(
"#"
)[
0
]
.
replace
(
"["
,
""
)
.
replace
(
"]"
,
""
)
.
strip
()
if
line
.
find
(
":vars"
)
!=
-
1
or
line
.
find
(
":children"
)
!=
-
1
:
if
line
.
find
(
":vars"
)
!=
-
1
or
line
.
find
(
":children"
)
!=
-
1
:
active_group_name
=
active_group_name
.
rsplit
(
":"
,
1
)[
0
]
active_group_name
=
active_group_name
.
rsplit
(
":"
,
1
)[
0
]
if
active_group_name
not
in
self
.
groups
:
if
active_group_name
not
in
self
.
groups
:
...
@@ -78,7 +78,7 @@ class InventoryParser(object):
...
@@ -78,7 +78,7 @@ class InventoryParser(object):
elif
line
.
startswith
(
"#"
)
or
line
==
''
:
elif
line
.
startswith
(
"#"
)
or
line
==
''
:
pass
pass
elif
active_group_name
:
elif
active_group_name
:
tokens
=
shlex
.
split
(
line
)
tokens
=
shlex
.
split
(
line
.
split
(
"#"
)[
0
]
)
if
len
(
tokens
)
==
0
:
if
len
(
tokens
)
==
0
:
continue
continue
hostname
=
tokens
[
0
]
hostname
=
tokens
[
0
]
...
...
test/inventory_dir/3comments
0 → 100644
View file @
ba78360c
[major-god] # group with inline comments
zeus var_a=1 # host with inline comments
# A comment
thor
[minor-god] # group with inline comment and unbalanced quotes: ' "
morpheus # host with inline comments and unbalanced quotes: ' "
# A comment with unbalanced quotes: ' "
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment