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

Exiting as 0 now. Also added debug to show valid command list.

Browse Source
This commit is contained in:
Robert Keizer 2013-05-27 20:56:33 -05:00
parent 17c4f5a988
commit 4e47287af7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/modules/zfs.py
View File

@ -39,13 +39,14 @@ def _available_commands( ):
if not zfs_path:
return False
# TODO: Supress the ERROR log generated when we read stderr..
_return = [ ]
res = __salt__['cmd.run_all']("%s help" % zfs_path)
# Note that we append '|| :' as a unix hack to force return code to be 0.
res = __salt__['cmd.run_all']("%s help || :" % zfs_path)
for line in res['stderr'].splitlines( ):
if re.match( " [a-zA-Z]", line ):
for cmd in [ cmd.strip() for cmd in line.split( " " )[0].split( "|" ) ]:
_return.append( cmd )
if cmd not in _return:
_return.append( cmd )
return _return
def _check_command( command ):
@ -77,7 +78,7 @@ def __virtual__():
for available_cmd in _available_commands( ):
# Define a new function here based on avaiable_cmd.
# Also update __func_alias__
pass
log.debug( "Would create function for %s" % available_cmd )
def list_(*args):
'''