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

Make the ckminions always return a list

Browse Source
This commit is contained in:
Thomas S Hatch 2012-10-06 14:31:04 -06:00
parent 5302457f47
commit 6d783db8da
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/utils/minions.py
View File

@ -28,7 +28,7 @@ class CkMinions(object):
os.chdir(os.path.join(self.opts['pki_dir'], 'minions')) os.chdir(os.path.join(self.opts['pki_dir'], 'minions'))
ret = set(glob.glob(expr)) ret = set(glob.glob(expr))
os.chdir(cwd) os.chdir(cwd)
return ret return list(ret)
def _check_list_minions(self, expr): def _check_list_minions(self, expr):
''' '''
@ -53,7 +53,7 @@ class CkMinions(object):
if reg.match(fn_): if reg.match(fn_):
ret.add(fn_) ret.add(fn_)
os.chdir(cwd) os.chdir(cwd)
return ret return list(ret)
def _check_grain_minions(self, expr): def _check_grain_minions(self, expr):
''' '''