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

better cope with rpm not returning package name

Browse source 
if the rpm query is missing a package name (or giving some error): fail soft

before the patch: the module fails because the installed_state dict is missing the package name

after the patch: the missing package is assumed to not be in the correct state and is installed/removed with zypper
This commit is contained in:
Robin Roth 2015-11-11 11:57:11 +01:00 committed by Matt Clay
parent b36b12e968
commit 85f2165273
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/modules/extras/packaging/os/zypper.py
View file

@ -161,7 +161,7 @@ def get_package_state(m, packages):
for stdoutline in stdout.splitlines(): for stdoutline in stdout.splitlines():
match = rpmoutput_re.match(stdoutline) match = rpmoutput_re.match(stdoutline)
if match == None: if match == None:
return None continue
package = match.group(1) package = match.group(1)
result = match.group(2) result = match.group(2)
if result == 'is installed': if result == 'is installed':
@ -169,18 +169,13 @@ def get_package_state(m, packages):
else: else:
installed_state[package] = False installed_state[package] = False
for package in packages:
if package not in installed_state:
print package + ' was not returned by rpm \n'
return None
return installed_state return installed_state
# Function used to make sure a package is present. # Function used to make sure a package is present.
def package_present(m, name, installed_state, package_type, disable_gpg_check, disable_recommends, old_zypper): def package_present(m, name, installed_state, package_type, disable_gpg_check, disable_recommends, old_zypper):
packages = [] packages = []
for package in name: for package in name:
if installed_state[package] is False: if package not in installed_state or installed_state[package] is False:
packages.append(package) packages.append(package)
if len(packages) != 0: if len(packages) != 0:
cmd = ['/usr/bin/zypper', '--non-interactive'] cmd = ['/usr/bin/zypper', '--non-interactive']
@ -246,7 +241,7 @@ def package_latest(m, name, installed_state, package_type, disable_gpg_check, di
def package_absent(m, name, installed_state, package_type, old_zypper): def package_absent(m, name, installed_state, package_type, old_zypper):
packages = [] packages = []
for package in name: for package in name:
if installed_state[package] is True: if package not in installed_state or installed_state[package] is True:
packages.append(package) packages.append(package)
if len(packages) != 0: if len(packages) != 0:
cmd = ['/usr/bin/zypper', '--non-interactive', 'remove', '-t', package_type] cmd = ['/usr/bin/zypper', '--non-interactive', 'remove', '-t', package_type]