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

lint fixes

Browse Source
This commit is contained in:
Thomas S Hatch 2014-03-04 23:57:55 -07:00
parent 54bb1e5e03
commit 07260db514
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/crypt.py
View File

@ -393,7 +393,7 @@ class Auth(object):
syndic_finger = self.opts.get('syndic_finger', self.opts.get('master_finger', False))
if syndic_finger:
if salt.utils.pem_finger(m_pub_fn) != syndic_finger:
_finger_fail(syndic_finger, m_pub_fn)
self._finger_fail(syndic_finger, m_pub_fn)
else:
if self.opts.get('master_finger', False):
if salt.utils.pem_finger(m_pub_fn) != self.opts['master_finger']:
@ -401,7 +401,7 @@ class Auth(object):
auth['publish_port'] = payload['publish_port']
return auth
def _finger_fail(finger, master_key):
def _finger_fail(self, finger, master_key):
log.critical(
'The specified fingerprint in the master configuration '
'file:\n{0}\nDoes not match the authenticating master\'s '

5
salt/utils/odict.py
View File

@ -329,7 +329,8 @@ class DefaultOrderedDict(OrderedDict):
import copy
return type(self)(self.default_factory,
copy.deepcopy(self.items()))
def __repr__(self):
def __repr__(self, _repr_running={}): # pylint: disable=W0102
return 'DefaultOrderedDict(%s, %s)' % (self.default_factory,
super(DefaultOrderedDict,
super(DefaultOrderedDict,
self).__repr__())