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

[ballombe at cvs.alioth.debian.org]

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

Modified Files:
	cron.weekly changelog 
Log Message:
Fix typo in comment.
Remove support for sending compressed email since there is no support
for that feature on the server side, and debian/cron.weekly being a
conffile should be kept simple.


Index: cron.weekly
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/cron.weekly,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- cron.weekly	4 Sep 2006 16:47:51 -0000	1.17
+++ cron.weekly	7 Oct 2006 14:50:32 -0000	1.18
@@ -16,7 +16,7 @@
 . /usr/share/popularity-contest/default.conf
 . /etc/popularity-contest.conf
 
-# don't run if MAILTO address is blank, or not configured to use HTTP POST!
+# don't run if MAILTO address is blank, and not configured to use HTTP POST!
 if [ -z "$MAILTO" ] && [ "yes" != "$USEHTTP" ]; then exit 0; fi
 
 # don't run if PARTICIPATE is "no" or unset!
@@ -65,42 +65,18 @@
 
 if [ yes != "$SUBMITTED" ] && [ "$MAILTO" ]; 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
-        	# Make compresssed email
-		if [ -n "$MAILFROM" ]; then
-			gzip -9 < $POPCON | mime-construct \
-			    --type application/x-popcon-compressed \
-			    --encoding base64 --file - \
-			    --subject "popularity-contest submission" \
-			    --to "$MAILTO" \
-			    --header "From: <$MAILFROM>" \
-			    --header "Sender: <$MAILFROM>" \
-			    --output | do_sendmail
-		else
-			gzip -9 < $POPCON | mime-construct \
-			    --type application/x-popcon-compressed \
-			    --encoding base64 --file - \
-			    --subject "popularity-contest submission" \
-			    --to "$MAILTO" \
-			    --output | do_sendmail
-		fi
-	else
-            # Not able to make compressed email, send uncompressed
-	    (
-		if [ -n "$MAILFROM" ]; then
-		    	echo "From: <$MAILFROM>"
-			echo "Sender: <$MAILFROM>"
-		fi
-		echo "To: $MAILTO"
-		echo "Subject: popularity-contest submission"
-		echo "MIME-Version: 1.0"
-		echo "Content-Type: text/plain"
-		echo
-		cat $POPCON
-	    ) | do_sendmail
-	fi
+	(
+	    if [ -n "$MAILFROM" ]; then
+	        	echo "From: <$MAILFROM>"
+	    	echo "Sender: <$MAILFROM>"
+	    fi
+	    echo "To: $MAILTO"
+	    echo "Subject: popularity-contest submission"
+	    echo "MIME-Version: 1.0"
+	    echo "Content-Type: text/plain"
+	    echo
+	    cat $POPCON
+	) | do_sendmail
 	SUBMITTED=yes
     else
 	logger -t popularity-contest "unable to submit report using sendmail."

Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -d -r1.330 -r1.331
--- changelog	7 Oct 2006 14:32:46 -0000	1.330
+++ changelog	7 Oct 2006 14:50:32 -0000	1.331
@@ -1,7 +1,12 @@
 popularity-contest (1.36) UNRELEASED; urgency=low
 
-  * Remove support for woody.
-  * Do not report atimes of files in /boot since they are equal to mtimes.
+  * popularity-contest:
+   + Remove support for woody.
+   + Do not report atimes of files in /boot since they are equal to mtimes.
+  * debian/cron.weekly: 
+   + Remove support for sending compressed email since there is no support
+     for that feature on the server side, and debian/cron.weekly being a 
+     conffile should be kept simple.
 
  -- Bill Allombert <ballombe at debian.org>  Sat,  7 Oct 2006 16:21:10 +0200