Fixes _find_binaries not using globals

_find_binaries now sets the right globals
Binaries are now properly populated (reverse path/binary for loops)
reviewable/pr18780/r1
Michel Blanc 13 years ago
parent ca8002d7c5
commit cebba29fb6

@ -41,6 +41,8 @@ def fail_json(d):
def _find_binaries(): def _find_binaries():
# list of possible paths for service/chkconfig binaries # list of possible paths for service/chkconfig binaries
# with the most probable first # with the most probable first
global CHKCONFIG
global SERVICE
paths = ['/sbin', '/usr/sbin', '/bin', '/usr/bin'] paths = ['/sbin', '/usr/sbin', '/bin', '/usr/bin']
binaries = [ 'service', 'chkconfig', 'update-rc.d' ] binaries = [ 'service', 'chkconfig', 'update-rc.d' ]
location = dict() location = dict()
@ -48,26 +50,24 @@ def _find_binaries():
for binary in binaries: for binary in binaries:
location[binary] = None 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): if os.path.exists(path + '/' + binary):
location[binary] = path + '/' + binary location[binary] = path + '/' + binary
break break
if location.get('chkconfig', None): if location.get('chkconfig', None):
CHKCONFIG = location['chkconfig'] CHKCONFIG = location['chkconfig']
elif location.get('update-rc.d', None): elif location.get('update-rc.d', None):
CHKCONFIG = location['update-rc.d'] CHKCONFIG = location['update-rc.d']
else: else:
fail_json(dict(failed=True, msg='unable to find chkconfig or update-rc.d binary')) fail_json(dict(failed=True, msg='unable to find chkconfig or update-rc.d binary'))
if location.get('service', None): if location.get('service', None):
SERVICE = location['service'] SERVICE = location['service']
else: else:
fail_json(dict(failed=True, msg='unable to find service binary')) fail_json(dict(failed=True, msg='unable to find service binary'))
def _run(cmd): def _run(cmd):
# returns (rc, stdout, stderr) from shell command # returns (rc, stdout, stderr) from shell command
process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)

Loading…
Cancel
Save