cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1353 from mscherer/remove_unsafe_shell_pkgutil

Browse source 
Simplify the code and remove use_unsafe_shell=True
This commit is contained in:
Brian Coca 2016-01-04 08:58:21 -05:00
commit a412ee7ed8
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packaging/os/pkgutil.py
View file

@ -76,14 +76,13 @@ def package_latest(module, name, site):
# Only supports one package
cmd = [ 'pkgutil', '--single', '-c' ]
if site is not None:
cmd += [ '-t', pipes.quote(site) ]
cmd.append(pipes.quote(name))
cmd += [ '| tail -1 | grep -v SAME' ]
rc, out, err = run_command(module, cmd, use_unsafe_shell=True)
if rc == 1:
return True
else:
return False
cmd += [ '-t', site]
cmd.append(name)
rc, out, err = run_command(module, cmd)
# replace | tail -1 |grep -v SAME
# use -2, because splitting on \n create a empty line
# at the end of the list
return 'SAME' in out.split('\n')[-2]
def run_command(module, cmd, **kwargs):
progname = cmd[0]