[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.5.dfsg-2-5-g7774d56

[Sergey B Kirpichev]

The following commit has been merged in the master branch:
commit 40eea50bfc77879fee834f436d2e04e9cef88299
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Tue May 18 18:06:02 2010 +0400

    Show error messages from cron jobs (Closes: #580672, thanks to Ken Neighbors)

diff --git a/debian/buildstatic.sh b/debian/buildstatic.sh
index 91dd4d9..a9c5639 100755
--- a/debian/buildstatic.sh
+++ b/debian/buildstatic.sh
@@ -10,8 +10,12 @@ set -e
 DEFAULT=/etc/default/awstats
 AWSTATS=/usr/lib/cgi-bin/awstats.pl
 BUILDSTATICPAGES=/usr/share/awstats/tools/awstats_buildstaticpages.pl
+ERRFILE=`mktemp /tmp/awstats.XXXXXXXXXX`
+
+trap 'rm -f $ERRFILE' INT QUIT TERM EXIT
 
 [ -f $AWSTATS -a -f $BUILDSTATICPAGES ] || exit 1
+
 [ -r "$DEFAULT" ] && . "$DEFAULT"
 
 cd /etc/awstats
@@ -24,11 +28,14 @@ do
   m=`date +%m`
   mkdir -p /var/cache/awstats/$c/$Y/$m/
   AL=${AWSTATS_LANG:-en}
-  $BUILDSTATICPAGES \
+  if ! $BUILDSTATICPAGES \
     -config=$c \
 	-year=$Y \
 	-month=$m \
 	-lang=$AL \
 	-staticlinksext=${AL}.html \
-	-dir=/var/cache/awstats/$c/$Y/$m/
-done >/dev/null
+	-dir=/var/cache/awstats/$c/$Y/$m/ >$ERRFILE 2>&1
+  then
+    cat $ERRFILE >&2 # an error occurred
+  fi
+done
diff --git a/debian/update.sh b/debian/update.sh
index bd49d5d..1bb1ebe 100755
--- a/debian/update.sh
+++ b/debian/update.sh
@@ -9,6 +9,9 @@ set -e
 
 DEFAULT=/etc/default/awstats
 AWSTATS=/usr/lib/cgi-bin/awstats.pl
+ERRFILE=`mktemp /tmp/awstats.XXXXXXXXXX`
+
+trap 'rm -f $ERRFILE' INT QUIT TERM EXIT
 
 [ -f $AWSTATS ] || exit 1
 
@@ -18,5 +21,8 @@ for c in awstats \
          `/bin/ls -1 awstats.*.conf 2>/dev/null | \
           /bin/sed 's/^awstats\.\(.*\)\.conf/\1/'`
 do
-  $AWSTATS -config=$c -update
-done >/dev/null
+  if ! $AWSTATS -config=$c -update >$ERRFILE 2>&1
+  then
+    cat $ERRFILE >&2 # an error occurred
+  fi
+done

-- 
awstats Debian packaging