saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #28472 from gtmanfred/2015.8

Browse source 
overwrite more than one value with names
This commit is contained in:
Mike Place 2015-11-02 10:56:53 -07:00
commit f3640b3ad6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/state.py
View file

@ -41,7 +41,7 @@ from salt.utils.odict import OrderedDict, DefaultOrderedDict
# Import third party libs
# pylint: disable=import-error,no-name-in-module,redefined-builtin
import salt.ext.six as six
from salt.ext.six.moves import range
from salt.ext.six.moves import map, range
# pylint: enable=import-error,no-name-in-module,redefined-builtin
log = logging.getLogger(__name__)
@ -536,7 +536,7 @@ class Compiler(object):
if isinstance(entry, dict):
low_name = next(six.iterkeys(entry))
live['name'] = low_name
live.update(entry[low_name][0])
list(map(live.update, entry[low_name]))
else:
live['name'] = entry
live['name_order'] = name_order
@ -1167,7 +1167,7 @@ class State(object):
if isinstance(entry, dict):
low_name = next(six.iterkeys(entry))
live['name'] = low_name
live.update(entry[low_name][0])
list(map(live.update, entry[low_name]))
else:
live['name'] = entry
live['name_order'] = name_order