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

Fix pkgin search (yielding wrong results under certain conditions, see inline comments).

Browse source
This commit is contained in:
Andreas Kaiser 2013-07-24 16:18:14 +02:00
parent 2da5dc7886
commit 1bf6656f0b
1 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
packaging/pkgin
View file

@ -59,6 +59,7 @@ import shlex
import os import os
import sys import sys
def query_package(module, pkgin_path, name, state="present"): def query_package(module, pkgin_path, name, state="present"):
if state == "present": if state == "present":
@ -66,7 +67,34 @@ def query_package(module, pkgin_path, name, state="present"):
rc, out, err = module.run_command("%s list | grep ^%s" % (pkgin_path, name)) rc, out, err = module.run_command("%s list | grep ^%s" % (pkgin_path, name))
if rc == 0: if rc == 0:
return True # At least one package with a package name that starts with ``name``
# is installed. For some cases this is not sufficient to determine
# wether the queried package is installed.
#
# E.g. for ``name='gcc47'``, ``gcc47`` not being installed, but
# ``gcc47-libs`` being installed, ``out`` would be:
#
# gcc47-libs-4.7.2nb4 The GNU Compiler Collection (GCC) support shared libraries.
#
# Multiline output is also possible, for example with the same query
# and bot ``gcc47`` and ``gcc47-libs`` being installed:
#
# gcc47-libs-4.7.2nb4 The GNU Compiler Collection (GCC) support shared libraries.
# gcc47-4.7.2nb3 The GNU Compiler Collection (GCC) - 4.7 Release Series
# Loop over lines in ``out``
for line in out.split('\n'):
# Strip description
# (results in sth. like 'gcc47-libs-4.7.2nb4')
pkgname_with_version = out.split(' ')[0]
# Strip version
# (results in sth like 'gcc47-libs')
pkgname_without_version = '-'.join(pkgname_with_version.split('-')[:-1])
if name == pkgname_without_version:
return True
return False return False