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

Pylint

Browse source
This commit is contained in:
Colton Myers 2015-05-30 13:44:14 -06:00
parent bb8a6c6cc9
commit be21aaa122
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/utils/dictupdate.py
View file

@ -10,7 +10,6 @@ import collections
import copy
import logging
import salt.ext.six as six
from salt.utils.odict import OrderedDict
from salt.utils.serializers.yamlex \
import merge_recursive as _yamlex_merge_recursive
@ -29,7 +28,7 @@ def update(dest, upd, recursive_update=True):
if dest is None:
return upd
updkeys = list(upd.keys())
if not (set(list(dest.keys())) & set(updkeys)):
if not set(list(dest.keys())) & set(updkeys):
recursive_update = False
if recursive_update:
for key in updkeys: