From cebba29fb6739f14b62c86501632d9032d3d9437 Mon Sep 17 00:00:00 2001 From: Michel Blanc Date: Thu, 3 May 2012 12:36:06 +0200 Subject: [PATCH] Fixes _find_binaries not using globals _find_binaries now sets the right globals Binaries are now properly populated (reverse path/binary for loops) --- service | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/service b/service index 755cd5b2be6..7c5d9aeffa0 100755 --- a/service +++ b/service @@ -41,6 +41,8 @@ def fail_json(d): def _find_binaries(): # list of possible paths for service/chkconfig binaries # with the most probable first + global CHKCONFIG + global SERVICE paths = ['/sbin', '/usr/sbin', '/bin', '/usr/bin'] binaries = [ 'service', 'chkconfig', 'update-rc.d' ] location = dict() @@ -48,13 +50,11 @@ def _find_binaries(): for binary in binaries: location[binary] = None - for path in paths: - for binary in binaries: + for binary in binaries: + for path in paths: if os.path.exists(path + '/' + binary): location[binary] = path + '/' + binary break - - if location.get('chkconfig', None): CHKCONFIG = location['chkconfig'] @@ -62,12 +62,12 @@ def _find_binaries(): CHKCONFIG = location['update-rc.d'] else: fail_json(dict(failed=True, msg='unable to find chkconfig or update-rc.d binary')) - if location.get('service', None): SERVICE = location['service'] else: fail_json(dict(failed=True, msg='unable to find service binary')) + def _run(cmd): # returns (rc, stdout, stderr) from shell command process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) @@ -186,11 +186,11 @@ if state or enable: rc_state = rc and rc1 and rc2 stdout = stdout1 + stdout2 stderr = stderr1 + stderr2 - + out += stdout err += stderr rc = rc and rc_state - + if rc != 0: print json.dumps({ @@ -224,7 +224,7 @@ elif list_items is not None: else: - print json.dumps(dict(failed=True, msg="expected state or list parameters")) + print json.dumps(dict(failed=True, msg="expected state or list parameters")) sys.exit(0)