Merge pull request #35407 from hu-dabao/fix-35094

[Fix-35094] None will not be added to grains which generate [none]
saltstack · Aug 12, 2016 · a5fe05b · a5fe05b
2 parents 4dc776f + a23108f
commit a5fe05b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/salt/modules/grains.py b/salt/modules/grains.py
@@ -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: