From 6e3e93d5854960dee1e7516922647c303e4094b8 Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Tue, 17 Mar 2020 16:05:14 +0100 Subject: [PATCH] [PKGS-7388] only perform check for Debian, Mint, Ubuntu --- CHANGELOG.md | 1 + include/tests_ports_packages | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 258b806e..9535b64a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -106,6 +106,7 @@ Using the relevant options, the scan will change base on the intended goal. - NAME-4408 - corrected Report function call - NETW-3032 - small rewrite of test and extended with addrwatch - PHP-2372 - don't look in the cli configuration files +- PKGS-7388 - only perform check for Debian/Ubuntu/Mint - PKGS-7410 - use multiple package managers when available - PKGS-7410 - added support for Zypper to test number of kernels - PROC-3602 - allow different root directory diff --git a/include/tests_ports_packages b/include/tests_ports_packages index 326bd94f..f2291a03 100644 --- a/include/tests_ports_packages +++ b/include/tests_ports_packages @@ -983,7 +983,15 @@ # # Test : PKGS-7388 # Description : Check security repository in Debian/ubuntu apt sources.list file - if [ -f ${ROOTDIR}etc/apt/sources.list -a -d ${ROOTDIR}etc/apt/sources.list.d ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + if [ -f ${ROOTDIR}etc/apt/sources.list -a -d ${ROOTDIR}etc/apt/sources.list.d ]; then + case "${LINUX_VERSION}" in + "Debian" | "Linux Mint" | "Ubuntu") PREQS_MET="YES" ;; + *) + PREQS_MET="NO" + LogText "Skipping test, although sources.list or sources.list.d exists. This specific OS version most likely has no security repository" + ;; + esac + fi Register --test-no PKGS-7388 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check security repository in Debian/ubuntu apt sources.list file" if [ $SKIPTEST -eq 0 ]; then FOUND=0