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

Lint roller

Browse source
This commit is contained in:
C. R. Oldham 2015-08-10 12:53:23 -06:00
parent 79833e3f8a
commit aa5e9c80b5
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/master.py
View file

@ -2147,15 +2147,10 @@ class ClearFuncs(object):
import traceback
type_, value_, traceback_ = sys.exc_info()
log.error(
'ARGH Exception occurred while authenticating: {0}'.format(exc)
)
log.error(traceback.format_exception(
type_, value_, traceback_))
return ''
log.error(
'Exception occurred while authenticating: {0}'.format(exc)
)
log.error(traceback.format_exception(type_, value_, traceback_))
return ''
def get_token(self, clear_load):
@ -2335,10 +2330,6 @@ class ClearFuncs(object):
log.error(traceback.format_exception(
type_, value_, traceback_))
return ''
log.error(
'Exception occurred while authenticating: {0}'.format(exc)
)
return ''
# auth_list = self.opts['external_auth'][extra['eauth']][name] if name in self.opts['external_auth'][extra['eauth']] else self.opts['external_auth'][extra['eauth']]['*']