[debsums] 31/184: Fix the cronjob when the ignore file is missing or empty

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository debsums.

commit a8f9e4dd5827ff5c9abe1d5f2fb088d476cf9439
Author: Francois Marier <francois at debian.org>
Date:   Sat Sep 20 14:52:28 2008 +1200

    Fix the cronjob when the ignore file is missing or empty
---
 debian/changelog          |  6 ++++++
 debian/debsums.cron.daily | 17 +++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e2c3b8..5d2d76e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debsums (2.0.38) UNRELEASED; urgency=low
+
+  * Fix the cronjob when the ignore file is empty or missing (closes: #499532)
+
+ -- Francois Marier <francois at debian.org>  Sat, 20 Sep 2008 14:51:49 +1200
+
 debsums (2.0.37) unstable; urgency=low
 
   [ Mike Forbes ]
diff --git a/debian/debsums.cron.daily b/debian/debsums.cron.daily
index cbc483e..2cbd46e 100755
--- a/debian/debsums.cron.daily
+++ b/debian/debsums.cron.daily
@@ -1,8 +1,17 @@
-#!/bin/sh -e
+#!/bin/sh
 
-debsums=/usr/bin/debsums
-ignorefile=/etc/debsums-ignore
+debsums="/usr/bin/debsums"
 
 [ -x $debsums ] || exit 0
 
-$debsums -cs 2>&1 | egrep -v "`cat $ignorefile`"
+debsumscmd="$debsums -cs"
+
+ignorefile="/etc/debsums-ignore"
+ignorelist="`cat $ignorefile 2> /dev/null`"
+
+if [ "z$ignorelist" = "z" ] ; then
+	# The ignore list is empty
+	$debsumscmd
+else
+	$debsumscmd 2>&1 | egrep -v "$ignorelist"
+fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/debsums.git