From d54f84f2273bddc418e2d8900ef9d1792166ca9c Mon Sep 17 00:00:00 2001 From: Ross Williams Date: Sat, 9 Oct 2021 12:50:30 +0000 Subject: [PATCH] pkgng: refactor upgraded pattern matching Implement russoz's suggestion to put all variants in the pattern. --- plugins/modules/packaging/os/pkgng.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/modules/packaging/os/pkgng.py b/plugins/modules/packaging/os/pkgng.py index a672987d74..27aceaba0b 100644 --- a/plugins/modules/packaging/os/pkgng.py +++ b/plugins/modules/packaging/os/pkgng.py @@ -191,10 +191,9 @@ def upgrade_packages(module, pkgng_path, dir_arg): cmd += " -n" rc, out, err = module.run_command(cmd) - for action in ('upgraded', 'reinstalled',): - match = re.search('^Number of packages to be %s: ([0-9]+)' % (action,), out, re.MULTILINE) - if match: - upgraded_c += int(match.group(1)) + matches = re.findall('^Number of packages to be (?:upgraded|reinstalled): ([0-9]+)', out, re.MULTILINE) + for match in matches: + upgraded_c += int(match) if upgraded_c > 0: return (True, "updated %s package(s)" % upgraded_c, out, err)