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

if key not in dest, don't recurse

Browse source
This commit is contained in:
Colton Myers 2015-05-26 10:41:27 -06:00
parent d8a84b3017
commit 8599143200
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/dictupdate.py
View file

@ -24,7 +24,7 @@ def update(dest, upd):
valtype = OrderedDict
else:
valtype = dict
dest_subkey = dest.get(key, valtype())
dest_subkey = dest.get(key, None)
except AttributeError:
dest_subkey = None
if isinstance(dest_subkey, collections.Mapping) \