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

pkgin: Support multiple matching packages

Browse source 
pkgin searches for packages such as 'emacs' can return multiple matches,
the first of which is not guaranteed to match.  So, iterate through
found packages until we have an appropriate match.  Should we *not* find
a match, then return False indicating match failure.
This commit is contained in:
Christopher M. Fuhrman 2015-08-18 13:32:17 -07:00
parent b670c7969b
commit 24ae49bbd9
1 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
packaging/os/pkgin.py
View file

@ -68,6 +68,7 @@ import shlex
import os import os
import sys import sys
import pipes import pipes
import re
def query_package(module, pkgin_path, name): def query_package(module, pkgin_path, name):
"""Search for the package by name. """Search for the package by name.
@ -95,33 +96,46 @@ def query_package(module, pkgin_path, name):
# rc will not be 0 unless the search was a success # rc will not be 0 unless the search was a success
if rc == 0: if rc == 0:
# Get first line # Search results may contain more than one line (e.g., 'emacs'), so iterate
line = out.split('\n')[0] # through each line to see if we have a match.
packages = out.split('\n')
# Break up line at spaces. The first part will be the package with its for package in packages:
# version (e.g. 'gcc47-libs-4.7.2nb4'), and the second will be the state
# of the package:
# '' - not installed
# '<' - installed but out of date
# '=' - installed and up to date
# '>' - installed but newer than the repository version
pkgname_with_version, raw_state = out.split(splitchar)[0:2]
# Strip version # Break up line at spaces. The first part will be the package with its
# (results in sth like 'gcc47-libs') # version (e.g. 'gcc47-libs-4.7.2nb4'), and the second will be the state
pkgname_without_version = '-'.join(pkgname_with_version.split('-')[:-1]) # of the package:
# '' - not installed
# '<' - installed but out of date
# '=' - installed and up to date
# '>' - installed but newer than the repository version
pkgname_with_version, raw_state = package.split(splitchar)[0:2]
if name != pkgname_without_version: # Search for package, stripping version
return False # (results in sth like 'gcc47-libs' or 'emacs24-nox11')
# no fall-through pkg_search_obj = re.search(r'^([a-zA-Z]+[0-9]*[\-]*\w*)-[0-9]', pkgname_with_version, re.M)
# The package was found; now return its state # Do not proceed unless we have a match
if raw_state == '<': if not pkg_search_obj:
return 'outdated' continue
elif raw_state == '=' or raw_state == '>':
return 'present' # Grab matched string
else: pkgname_without_version = pkg_search_obj.group(1)
return False
if name != pkgname_without_version:
continue
# The package was found; now return its state
if raw_state == '<':
return 'outdated'
elif raw_state == '=' or raw_state == '>':
return 'present'
else:
return False
# no fall-through
# No packages were matched, so return False
return False
def format_action_message(module, action, count): def format_action_message(module, action, count):