From e41af650803fa135d72ef7895b5b2aeda8211554 Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Sat, 28 Nov 2015 16:46:47 +0100 Subject: [PATCH] Fix #1587 : enable check for aptitude/apticron only in squeeze/wheezy --- evocheck.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 04495bf..e01cb5e 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -159,7 +159,8 @@ if [ -e /etc/debian_version ]; then fi if [ "$IS_APTITUDEONLY" = 1 ]; then - test -e /usr/bin/apt-get && echo 'IS_APTITUDEONLY FAILED!' + is_debianversion squeeze && test -e /usr/bin/apt-get && echo 'IS_APTITUDEONLY FAILED!' + is_debianversion wheezy && test -e /usr/bin/apt-get && echo 'IS_APTITUDEONLY FAILED!' fi if [ "$IS_APTICRON" = 1 ]; then @@ -167,7 +168,7 @@ if [ -e /etc/debian_version ]; then test -e /etc/cron.d/apticron || status="fail" test -e /etc/cron.daily/apticron && status="fail" test "$status" = "fail" || test -e /usr/bin/apt-get.bak || status="fail" - test "$status" = "fail" && echo 'IS_APTICRON FAILED!' + ( is_debianversion squeeze || is_debianversion wheezy ) && test "$status" = "fail" && echo 'IS_APTICRON FAILED!' fi if [ "$IS_USRRO" = 1 ]; then