Merge pull request #19590 from basepi/supervisordvirtual

Always return True from supervisord virtual function
This commit is contained in:
Mike Place 2015-01-10 08:56:36 -07:00
commit 329c8c5723

View File

@ -14,11 +14,10 @@ from salt._compat import configparser, string_types
def __virtual__():
HAS_SUPER = salt.utils.which('supervisorctl')
if HAS_SUPER:
return True
else:
return False
# We can't decide at load time whether supervisorctl is present. The
# function _get_supervisorctl_bin does a much more thorough job and can
# only be accurate at call time.
return True
def _get_supervisorctl_bin(bin_env):