diff options
| author | mboelen <michael@cisofy.com> | 2016-01-25 15:52:58 +0300 |
|---|---|---|
| committer | mboelen <michael@cisofy.com> | 2016-01-25 15:52:58 +0300 |
| commit | 727ff26283bf90b27daa035675cac348efab2fb2 (patch) | |
| tree | 2bd0b95d21a3ee312c3214eb929e1ca67119ee5a | |
| parent | a00b37f5b6aa45e305e5045784c91615fdac9307 (diff) | |
Show on screen that DNF is being used
| -rw-r--r-- | include/tests_ports_packages | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/tests_ports_packages b/include/tests_ports_packages index ce1a54ea..937c27a1 100644 --- a/include/tests_ports_packages +++ b/include/tests_ports_packages @@ -127,7 +127,7 @@ # # Test : PKGS-7308 # Description : RPM package based systems - if [ ! "${RPMBINARY}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + if [ ! "${RPMBINARY}" = "" -a "${DNFBINARY}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no PKGS-7308 --preqs-met ${PREQS_MET} --weight L --network NO --description "Checking package list with RPM" if [ ${SKIPTEST} -eq 0 ]; then N=0 @@ -381,7 +381,11 @@ if [ ! "${DNFBINARY}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no "PKGS-7350" --preqs-met ${PREQS_MET} --weight L --network NO --description "Checking for installed packages with DNF utility" if [ ${SKIPTEST} -eq 0 ]; then - LogText "Result: found DNF (Dandified YUM) utility" + Display --indent 4 --text "- Searching DNF package manager" --result FOUND --color GREEN + LogText "Result: found DNF (Dandified YUM) utility (binary: ${BINARY})" + Report "package_manager[]=dnf" + Display --indent 6 --text "- Querying DNF package manager" + PACKAGE_AUDIT_TOOL_FOUND=1 PACKAGE_AUDIT_TOOL="dnf" SPACKAGES=`${DNFBINARY} -q list installed 2>&1 /dev/null | awk '{ if ($1!="Installed" && $1!="Last") {print $1","$2 }}'` |