internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use get_bin_path properly

Browse Source
This commit is contained in:
Matt Wright
2012-08-31 15:03:26 -04:00
parent a092eadbbb
commit d52f1d969b
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/supervisorctl
View File

@@ -19,17 +19,8 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
#
def _find_supervisorctl():
paths = ['/usr/local/bin', '/usr/bin']
for p in paths:
e = p + '/supervisorctl'
if os.path.exists(e):
return e
def _is_present(name):
rc, out, err = _run('%s status' % _find_supervisorctl())
def _is_present(name, supervisorctl):
rc, out, err = _run('%s status' % supervisorctl)
return name in out
@@ -59,10 +50,7 @@ def main():
SUPERVISORCTL = module.get_bin_path('supervisorctl', True)
if SUPERVISORCTL is None:
module.fail_json(msg='supervisorctl is not installed')
present = _is_present(name)
present = _is_present(name, SUPERVISORCTL)
if state == 'present':
if not present: