Merge lp:~utlemming/popularity-contest/oneiric.lp707311 into lp:ubuntu/oneiric/popularity-contest

[Ben Howard]

Don't run cronjob if config file is missing (LP: #707311)

[Sebastien Bacher (seb128)]

Thank you for your work, this bug doesn't seem important enough to justify an SRU in the Oneiric serie though since that version is neither the current stable one nor a LTS

Unmerged revisions

26. By Ben Howard on 2012-10-29

Don't run cronjob if config file is missing (LP: #707311)

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-01 23:19:31 +0000
+++ debian/changelog	2012-10-29 11:59:25 +0000
@@ -1,3 +1,9 @@
+popularity-contest (1.53ubuntu2) UNRELEASED; urgency=low
+
+  * Don't run cronjob if /etc configuration file is missing (LP: #707311).
+
+ -- Ben Howard <[e-mail]>  Mon, 29 Oct 2012 12:41:56 +0100
+
 popularity-contest (1.53ubuntu1) oneiric; urgency=low
 
   * Merge from debian unstable. (LP: #804167) Remaining changes:

=== modified file 'debian/cron.daily'
--- debian/cron.daily	2011-05-23 15:38:47 +0000
+++ debian/cron.daily	2012-10-29 11:59:25 +0000
@@ -15,7 +15,7 @@
 
 # get configuration information
 . /usr/share/popularity-contest/default.conf
-. /etc/popularity-contest.conf
+. /etc/popularity-contest.conf || exit 0
 
 # don't run if MAILTO address is blank, and not configured to use HTTP POST!
 if [ -z "$MAILTO" ] && [ "yes" != "$USEHTTP" ]; then exit 0; fi