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

Merge pull request #22860 from nmadhok/patch-runtime-error

Browse Source 
Fixing issue that causes RuntimeError maximum recursion Fixes #22839
This commit is contained in:
Thomas S Hatch 2015-04-20 16:09:25 -06:00
commit 645480423c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/utils/lazy.py
View File

@ -98,7 +98,15 @@ class LazyDict(collections.MutableMapping):
'''
Check if the name is in the dict and return it if it is
'''
if name in self:
if name not in self._dict and not self.loaded:
# load the item
if self._load(name):
log.debug('LazyLoaded {0}'.format(name))
return self._dict[name]
else:
log.debug('Could not LazyLoad {0}'.format(name))
raise KeyError(name)
elif name in self:
return self[name]
raise AttributeError(name)