Safer approach

This commit is contained in:
Mike Place 2015-08-04 16:35:57 -06:00
parent 341c34ed6c
commit 625d03da4f

View File

@ -82,7 +82,8 @@ class AsyncTCPReqChannel(salt.transport.client.ReqChannel):
@classmethod @classmethod
def __key(cls, opts, **kwargs): def __key(cls, opts, **kwargs):
opts.update(kwargs) if 'master_uri' in kwargs:
opts['master_uri'] = kwargs['master_uri']
return (opts['pki_dir'], # where the keys are stored return (opts['pki_dir'], # where the keys are stored
opts['id'], # minion ID opts['id'], # minion ID
opts['master_uri'], # master ID opts['master_uri'], # master ID