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

None will not be added to grains which generate [none]

Browse Source
This commit is contained in:
Hengyang Hu 2016-08-11 16:20:37 -07:00
parent c032506e6b
commit a23108f795
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/grains.py
View File

@ -335,8 +335,9 @@ def append(key, val, convert=False, delimiter=DEFAULT_TARGET_DELIM):
salt '*' grains.append key val
'''
grains = get(key, [], delimiter)
if not isinstance(grains, list) and convert is True:
grains = [grains]
if convert:
if not isinstance(grains, list):
grains = [] if grains is None else [grains]
if not isinstance(grains, list):
return 'The key {0} is not a valid list'.format(key)
if val in grains: