pkgng: package reinstallations count as changed

`upgrade_packages()` only looked for the string
"Number of packages to be upgraded", but the
`pkg upgrade` command also reports "Number of packages to be
reinstalled". Reinstallation occurs when package metadata other
than version changes (e.g. build options, single architecture to `*`
architecture). In any other respect, though, a required
reinstallation is the same as an upgrade.

changelogs/fragments/3526-pkgng-add-integration-tests.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - 'pkgng - `name=* state=latest` check for upgrades did not count "Number of packages to be reinstalled" as a `changed` action, giving incorrect results in both regular and check mode'

plugins/modules/packaging/os/pkgng.py

@@ -191,9 +191,10 @@ def upgrade_packages(module, pkgng_path, dir_arg):
         cmd += " -n"
     rc, out, err = module.run_command(cmd)
 
-    match = re.search('^Number of packages to be upgraded: ([0-9]+)', out, re.MULTILINE)
+    for action in ('upgraded', 'reinstalled',):
-    if match:
+        match = re.search('^Number of packages to be %s: ([0-9]+)' % (action,), out, re.MULTILINE)
-        upgraded_c = int(match.group(1))
+        if match:
+            upgraded_c += int(match.group(1))
 
     if upgraded_c > 0:
         return (True, "updated %s package(s)" % upgraded_c, out, err)