wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More consistent use of run_command() wrapper function, which now adds the default binary location to the search path

Browse source
This commit is contained in:
james 2015-10-22 18:47:35 -05:00 committed by Matt Clay
parent d26e062331
commit c2a4e230aa
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/modules/extras/packaging/os/pkgutil.py
View file

@ -63,10 +63,10 @@ import os
import pipes import pipes
def package_installed(module, name): def package_installed(module, name):
cmd = [module.get_bin_path('pkginfo', True)] cmd = ['pkginfo']
cmd.append('-q') cmd.append('-q')
cmd.append(name) cmd.append(name)
rc, out, err = module.run_command(' '.join(cmd)) rc, out, err = run_command(module, cmd)
if rc == 0: if rc == 0:
return True return True
else: else:
@ -79,16 +79,16 @@ def package_latest(module, name, site):
cmd += [ '-t', pipes.quote(site) ] cmd += [ '-t', pipes.quote(site) ]
cmd.append(pipes.quote(name)) cmd.append(pipes.quote(name))
cmd += [ '| tail -1 | grep -v SAME' ] cmd += [ '| tail -1 | grep -v SAME' ]
rc, out, err = module.run_command(' '.join(cmd), use_unsafe_shell=True) rc, out, err = run_command(module, cmd, use_unsafe_shell=True)
if rc == 1: if rc == 1:
return True return True
else: else:
return False return False
def run_command(module, cmd): def run_command(module, cmd, **kwargs):
progname = cmd[0] progname = cmd[0]
cmd[0] = module.get_bin_path(progname, True) cmd[0] = module.get_bin_path(progname, True, ['/opt/csw/bin'])
return module.run_command(cmd) return module.run_command(cmd, **kwargs)
def package_install(module, state, name, site): def package_install(module, state, name, site):
cmd = [ 'pkgutil', '-iy' ] cmd = [ 'pkgutil', '-iy' ]