[Popcon-commits] cvs commit to popularity-contest/debian by pere
pere at cvs.alioth.debian.org
pere at cvs.alioth.debian.org
Sun Nov 13 22:26:25 UTC 2005
Update of /cvsroot/popcon/popularity-contest/debian
In directory haydn:/tmp/cvs-serv4806/debian
Modified Files:
changelog cron.weekly
Log Message:
[Petter Reinholdtsen]
* Add variable mirrorbase to popanal.py, to make it easier to set up
a new server.
* Remove listing email as the transport method in the package
description, and make the description independent of the method
used. This reflect the new HTTP transport support. (Closes: #321056)
* Update the FAQ to better reflect the support for HTTP submissions.
* popcon-upload-ubuntu: Replace ubuntulinux.org with ubuntu.com. Patch
from Colin Watson and Ubuntu.
* Correct use of 'su' in cron-script. (Closes: #331438)
* Make it possible to get popcon to only report using HTTP. Patch
from Vagrant Cascadian. (Closes: #325030)
[Mohammed Adnène Trojette]
* Translations:
- Updated Romanian by Eddy Petrisor. (Closes: #323225)
- Updated Swedish from Daniel Nylander. (Closes: #332710)
- Updated Tagalog from Eric Pareja. (Closes: #338614)
Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- changelog 13 Nov 2005 22:15:30 -0000 1.249
+++ changelog 13 Nov 2005 22:26:22 -0000 1.250
@@ -10,6 +10,8 @@
* popcon-upload-ubuntu: Replace ubuntulinux.org with ubuntu.com. Patch
from Colin Watson and Ubuntu.
* Correct use of 'su' in cron-script. (Closes: #331438)
+ * Make it possible to get popcon to only report using HTTP. Patch
+ from Vagrant Cascadian. (Closes: #325030)
[Mohammed Adnène Trojette]
* Translations:
Index: cron.weekly
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/cron.weekly,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cron.weekly 13 Nov 2005 22:15:31 -0000 1.15
+++ cron.weekly 13 Nov 2005 22:26:22 -0000 1.16
@@ -16,8 +16,8 @@
. /usr/share/popularity-contest/default.conf
. /etc/popularity-contest.conf
-# don't run if MAILTO address is blank!
-if [ -z "$MAILTO" ]; then exit 0; fi
+# don't run if MAILTO address is blank, or not configured to use HTTP POST!
+if [ -z "$MAILTO" ] && [ "yes" != "$USEHTTP" ]; then exit 0; fi
# don't run if PARTICIPATE is "no" or unset!
[ "$PARTICIPATE" = "no" ] || [ -z "$PARTICIPATE" ] && exit 0
@@ -63,7 +63,7 @@
# try to email the popularity contest data
-if [ yes != "$SUBMITTED" ]; then
+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.
More information about the Popcon-commits
mailing list