valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25682 from basepi/fix.hash.parsing

Browse Source 
[2015.5] Fix parsing args with just a hash (#)
This commit is contained in:
Colton Myers 2015-07-24 13:52:01 -06:00
commit 6a5c6dcd04
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/utils/args.py
View File

@ -109,7 +109,7 @@ def yamlify_arg(arg):
# Only yamlify if it parses into a non-string type, to prevent
# loss of content due to # as comment character
parsed_arg = yamlloader.load(arg, Loader=yamlloader.SaltYamlSafeLoader)
if isinstance(parsed_arg, string_types):
if isinstance(parsed_arg, string_types) or parsed_arg is None:
return arg
return parsed_arg
if arg == 'None':