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

Make the pcre stuff work

Browse source
This commit is contained in:
Thomas S Hatch 2011-03-11 12:21:09 -07:00
parent e5387b07f8
commit ec6672168d
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/cli/__init__.py
View file

@ -56,8 +56,12 @@ class SaltCMD(object):
Execute the salt command line
'''
local = salt.client.LocalClient()
print local.cmd(self.opts['tgt'],
args = [self.opts['tgt'],
self.opts['fun'],
self.opts['arg'],
self.opts['timeout'])
self.opts['timeout'],
]
if self.opts['pcre']:
args.append('pcre')
print local.cmd(*args)

2
salt/client.py
View file

@ -60,7 +60,7 @@ class LocalClient(object):
except:
raise SaltClientError('Failed to read in the salt root key')
def cmd(self, tgt, fun, arg=(), expr_form='glob', timeout=5):
def cmd(self, tgt, fun, arg=(), timeout=5, expr_form='glob'):
'''
Execute a salt command and return.
'''