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

Fix PyLint C0103 on salt.master. Refs #1775.

Browse Source
This commit is contained in:
Pedro Algarvio 2012-12-28 14:10:01 +00:00
parent a002efc4c9
commit a8f2e4e4dc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/master.py
View File

@ -585,15 +585,15 @@ class AESFuncs(object):
pub = None
try:
pub = RSA.load_pub_key(tmp_pub)
except RSA.RSAError as e:
except RSA.RSAError as err:
log.error('Unable to load temporary public key "{0}": {1}'
.format(tmp_pub, e))
.format(tmp_pub, err))
try:
os.remove(tmp_pub)
if pub.public_decrypt(token, 5) == 'salt':
return True
except RSA.RSAError, e:
log.error('Unable to decrypt token: {0}'.format(e))
except RSA.RSAError, err:
log.error('Unable to decrypt token: {0}'.format(err))
log.error('Salt minion claiming to be {0} has attempted to'
'communicate with the master and could not be verified'
@ -1362,8 +1362,8 @@ class ClearFuncs(object):
# and an empty request comes in
try:
pub = RSA.load_pub_key(pubfn)
except RSA.RSAError, e:
log.error('Corrupt public key "{0}": {1}'.format(pubfn, e))
except RSA.RSAError, err:
log.error('Corrupt public key "{0}": {1}'.format(pubfn, err))
return {'enc': 'clear',
'load': {'ret': False}}