From 360e6b66f60ef238f92c28dbff5d93b9154256a5 Mon Sep 17 00:00:00 2001
From: mboelen <michael@cisofy.com>
Date: Mon, 21 Dec 2015 19:10:22 +0100
Subject: [PATCH] Split name and version information for RPM based package
 manager

---
 include/tests_ports_packages | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/tests_ports_packages b/include/tests_ports_packages
index 2a5d4a99..69138c76 100644
--- a/include/tests_ports_packages
+++ b/include/tests_ports_packages
@@ -137,7 +137,7 @@
         logtext "Test: Querying 'rpm -qa' to get package list"
         Display --indent 6 --text "- Querying RPM package manager"
         logtext "Output:"; logtext "--------"
-        SPACKAGES=`${RPMBINARY} -qa 2> /dev/null | sort`
+        SPACKAGES=`${RPMBINARY} -qa --query "%{NAME},%{VERSION}-%{RELEASE}.%{ARCH}\n" 2> /dev/null | sort`
         if [ "${SPACKAGES}" = "" ]; then
             logtext "Result: RPM binary available, but package list seems to be empty"
             logtext "Info: looks like the rpm binary is installed, but not used for package installation"
@@ -145,8 +145,10 @@
           else
             for J in ${SPACKAGES}; do
                 N=`expr ${N} + 1`
+                PACKAGE_NAME=`echo ${J} | awk -F, '{print $1}'`
+                PACKAGE_VERSION=`echo ${J} | awk -F, '{print $2}'`
                 logtext "Found package: ${J}"
-                INSTALLED_PACKAGES="${INSTALLED_PACKAGES}|${J},0,"
+                INSTALLED_PACKAGES="${INSTALLED_PACKAGES}|${PACKAGE_NAME},${PACKAGE_VERSION},"
             done
             report "installed_packages=${N}"
         fi