wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4059 from dekked/devel

Browse source 
Fixed -e "" on ansible-playbook.
This commit is contained in:
Michael DeHaan 2013-09-07 05:56:59 -07:00
commit ddb09f11be
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/ansible-playbook
View file

@ -103,7 +103,7 @@ def main(args):
if extra_vars_opt.startswith("@"): if extra_vars_opt.startswith("@"):
# Argument is a YAML file (JSON is a subset of YAML) # Argument is a YAML file (JSON is a subset of YAML)
extra_vars = utils.combine_vars(extra_vars, utils.parse_yaml_from_file(extra_vars_opt[1:])) extra_vars = utils.combine_vars(extra_vars, utils.parse_yaml_from_file(extra_vars_opt[1:]))
elif extra_vars_opt[0] in '[{': elif extra_vars_opt and extra_vars_opt[0] in '[{':
# Arguments as YAML # Arguments as YAML
extra_vars = utils.combine_vars(extra_vars, utils.parse_yaml(extra_vars_opt)) extra_vars = utils.combine_vars(extra_vars, utils.parse_yaml(extra_vars_opt))
else: else: