fix typos, add more returns

This commit is contained in:
Tim Baker 2015-12-09 03:45:45 +10:00
parent b477cc7139
commit da0276ca4d
5 changed files with 5 additions and 5 deletions

View File

@ -14,7 +14,7 @@ def __virtual__():
'''
if __grains__['os'] == 'Gentoo' and salt.utils.which('eix'):
return 'eix'
return (False, 'The eix execution module cannot be loaded: either the system is not Gentoo or the eix binrary is not in the path.')
return (False, 'The eix execution module cannot be loaded: either the system is not Gentoo or the eix binary is not in the path.')
def sync():

View File

@ -18,7 +18,7 @@ def __virtual__():
'''
if __grains__['os'] == 'Gentoo' and salt.utils.which('eselect'):
return 'eselect'
return (False, 'The eselect execution module cannot be loaded: either the system is not Gentoo or the eselect binrary is not in the path.')
return (False, 'The eselect execution module cannot be loaded: either the system is not Gentoo or the eselect binary is not in the path.')
def exec_action(module, action, module_parameter=None, action_parameter=None, state_only=False):

View File

@ -24,7 +24,7 @@ def __virtual__():
if salt.utils.which('firewall-cmd'):
return True
return (False, 'The firewalld execution module cannot be loaded: the firewall-cmd binrary is not in the path.')
return (False, 'The firewalld execution module cannot be loaded: the firewall-cmd binary is not in the path.')
def __firewall_cmd(cmd):

View File

@ -31,7 +31,7 @@ def __virtual__():
'''
if HAS_HAPROXY:
return __virtualname__
return False
return (False, 'The haproxyconn execution module cannot be loaded: haproxyctl module not available')
def _get_conn(socket='/var/run/haproxy.sock'):

View File

@ -27,7 +27,7 @@ def __virtual__():
'''
if salt.utils.which('htpasswd'):
return __virtualname__
return False
return (False, 'The htpasswd execution mdule cannot be loaded: htpasswd binary not in path.')
def useradd_all(pwfile, user, password, opts='', runas=None):