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
e486dbab
Commit
e486dbab
authored
Mar 06, 2014
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the loaded variable since we have it assigned, not just for error detection.
parent
3f07ec3d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
lib/ansible/utils/__init__.py
+2
-1
No files found.
lib/ansible/utils/__init__.py
View file @
e486dbab
...
@@ -355,6 +355,7 @@ def parse_yaml(data, path_hint=None):
...
@@ -355,6 +355,7 @@ def parse_yaml(data, path_hint=None):
''' convert a yaml string to a data structure. Also supports JSON, ssssssh!!!'''
''' convert a yaml string to a data structure. Also supports JSON, ssssssh!!!'''
data
=
data
.
lstrip
()
data
=
data
.
lstrip
()
loaded
=
None
if
data
.
startswith
(
"{"
)
or
data
.
startswith
(
"["
):
if
data
.
startswith
(
"{"
)
or
data
.
startswith
(
"["
):
# since the line starts with { or [ we can infer this is a JSON document.
# since the line starts with { or [ we can infer this is a JSON document.
try
:
try
:
...
@@ -368,7 +369,7 @@ def parse_yaml(data, path_hint=None):
...
@@ -368,7 +369,7 @@ def parse_yaml(data, path_hint=None):
# else this is pretty sure to be a YAML document
# else this is pretty sure to be a YAML document
loaded
=
yaml
.
safe_load
(
data
)
loaded
=
yaml
.
safe_load
(
data
)
return
smush_ds
(
yaml
.
safe_load
(
data
)
)
return
smush_ds
(
loaded
)
def
process_common_errors
(
msg
,
probline
,
column
):
def
process_common_errors
(
msg
,
probline
,
column
):
replaced
=
probline
.
replace
(
" "
,
""
)
replaced
=
probline
.
replace
(
" "
,
""
)
...
...
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