[Popcon-commits] cvs commit to popularity-contest/debian by pere

[popcon-commits at lists.alioth.debian.org]

Update of /cvsroot/popcon/popularity-contest/debian
In directory haydn:/tmp/cvs-serv32157

Modified Files:
	cron.weekly 
Log Message:
Only log problem with sendmail if http failed and sendmail is missing,
and not when http upload succeeded.


Index: cron.weekly
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/cron.weekly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cron.weekly	5 Jul 2005 12:00:38 -0000	1.11
+++ cron.weekly	5 Jul 2005 12:02:37 -0000	1.12
@@ -61,7 +61,8 @@
 
 # try to email the popularity contest data
 
-if [ yes != "$SUBMITTED" ] && [ -x "`which sendmail 2>/dev/null`" ]; then
+if [ yes != "$SUBMITTED" ]; then
+    if [ -x "`which sendmail 2>/dev/null`" ]; then
 	# Sending compressed emails are disabled as the receiving end
 	# isn't implemented yet.
 	if false && [ -x "`which mime-construct 2>/dev/null`" ]; then
@@ -99,8 +100,9 @@
 	    ) | do_sendmail
 	fi
 	SUBMITTED=yes
-else
+    else
 	logger -t popcon "unable to submit report using sendmail."
+    fi
 fi
 
 if [ "yes" != "$SUBMITTED" ] ; then