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

Missing object item throws an AttributeError not a NameError.

Browse source
This commit is contained in:
C. R. Oldham 2015-10-12 13:22:15 -06:00
parent 4cf2b56d5f
commit ba3e423b87
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/minion.py
View file

@ -1331,9 +1331,9 @@ class Minion(MinionBase):
Refresh the functions and returners.
'''
log.debug('Refreshing modules. Notify={0}'.format(notify))
try:
if hasattr(self, 'proxy'):
self.functions, self.returners, _ = self._load_modules(force_refresh, notify=notify, proxy=self.proxy)
except NameError:
else:
self.functions, self.returners, _ = self._load_modules(force_refresh, notify=notify)
self.schedule.functions = self.functions