diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2019-10-08 17:43:09 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2019-10-08 17:43:09 +0300 |
| commit | 52e1231433eca258d868c6989cf02f26f3870146 (patch) | |
| tree | d2599e35e10a90be2c565408a8856769ebabda8e /include/tests_ports_packages | |
| parent | 87f559695267d114bde01b5dc8f2be4425aade41 (diff) | |
Additional check to ensure pacman package manager is used instead of pacman game
Diffstat (limited to 'include/tests_ports_packages')
| -rw-r--r-- | include/tests_ports_packages | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/tests_ports_packages b/include/tests_ports_packages index 55276ca5..eef56596 100644 --- a/include/tests_ports_packages +++ b/include/tests_ports_packages @@ -26,6 +26,7 @@ PACKAGE_MGR_PKG=0 PACKAGE_AUDIT_TOOL="" PACKAGE_AUDIT_TOOL_FOUND=0 + PACMANCONF="${ROOTDIR}etc/pacman.conf" INSTALLED_PACKAGES="" # ################################################################################# @@ -191,7 +192,7 @@ # # Test : PKGS-7310 # Description : pacman package based systems - if [ -n "${PACMANBINARY}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + if [ -n "${PACMANBINARY}" -a -f "${PACMANCONF}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no PKGS-7310 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Checking package list with pacman" if [ ${SKIPTEST} -eq 0 ]; then COUNT=0 @@ -222,7 +223,7 @@ # # Test : PKGS-7312 # Description : Check for available package updates when pacman package is used - if [ -n "${PACMANBINARY}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + if [ -n "${PACMANBINARY}" -a -f "${PACMANCONF}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no PKGS-7312 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Checking available updates for pacman based system" if [ ${SKIPTEST} -eq 0 ]; then FOUND=0 @@ -251,8 +252,7 @@ # # Test : PKGS-7314 # Description : Check pacman.conf options - PACMANCONF="/etc/pacman.conf" - if [ -n "${PACMANBINARY}" -a -f ${PACMANCONF} ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + if [ -n "${PACMANBINARY}" -a -f "${PACMANCONF}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no PKGS-7314 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Checking pacman configuration options" if [ ${SKIPTEST} -eq 0 ]; then COUNT=0 |