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

More optimization

Browse source
This commit is contained in:
Colton Myers 2015-05-29 18:10:45 -06:00
parent c933249d1a
commit bb8a6c6cc9
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/utils/dictupdate.py
View file

@ -28,10 +28,12 @@ def update(dest, upd, recursive_update=True):
'''
if dest is None:
return upd
if not (set(list(dest.keys())) & set(list(upd.keys()))):
updkeys = list(upd.keys())
if not (set(list(dest.keys())) & set(updkeys)):
recursive_update = False
if recursive_update:
for key, val in six.iteritems(upd):
for key in updkeys:
val = upd[key]
try:
dest_subkey = dest.get(key, None)
except AttributeError: