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

Bring back name overriding that was erroneously skipped as a result of type checking.

Browse Source
This commit is contained in:
Marica Odagaki 2013-03-06 08:19:13 +09:00
parent d4ba15d298
commit 0d0b682c8a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/state.py
View File

@ -908,10 +908,10 @@ class State(object):
if key == 'names':
names.update(val)
continue
elif key == 'name':
if not isinstance(val, string_types):
# Invalid name, fall back to ID
chunk[key] = name
elif (key == 'name' and
not isinstance(val, string_types)):
# Invalid name, fall back to ID
chunk[key] = name
else:
chunk.update(arg)
if names: