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

fix issues in the expresion manager

Browse source
This commit is contained in:
Thomas S Hatch 2011-03-17 00:05:43 -06:00
parent b95741eb14
commit d490578767
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/master.py
View file

@ -229,7 +229,7 @@ class ReqServer(threading.Thread):
'''
if not clear_load.pop('key') == self.key:
return ''
jid = self._prep_jid(load)
jid = self._prep_jid(clear_load)
payload = {'enc': 'aes'}
load = {
'fun': clear_load['fun'],

2
salt/minion.py
View file

@ -135,7 +135,7 @@ class Minion(object):
return ret
# Verify that the publication applies to this minion
if data.has_key('tgt_type'):
if not getattr(self, '_' + data['tgt_type'] + '_match')(*(data['tgt'])):
if not getattr(self, '_' + data['tgt_type'] + '_match')(data['tgt']):
return ret
else:
if not self._glob_match(data['tgt']):