Merge pull request #4059 from dekked/devel

Fixed -e "" on ansible-playbook.
pull/3945/merge
Michael DeHaan 11 years ago
commit ddb09f11be

@ -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:

Loading…
Cancel
Save