Add setting ENCRYPT=maybe, which encrypt if gpg is available.

Make ENCRYPT=yes to fail if gpg is not available.

debian/changelog

@@ -1,8 +1,10 @@
-popularity-contest (1.59) UNRELEASED; urgency=low
+popularity-contest (1.59) unstable; urgency=low
 
   * debian/cron.daily:
     - Provide a temporary homedir to gpg so it does not create /root/.gnupg.
       Also use 'set -e'. Closes: #714917 Thanks Ansgar Burchardt.
+    - Add setting ENCRYPT=maybe, which encrypt if gpg is available.
+      Make ENCRYPT=yes to fail if gpg is not available. Closes: #714918
 
  -- Bill Allombert <ballombe@debian.org>  Thu, 01 Aug 2013 16:26:31 +0200
 

debian/cron.daily

@@ -69,7 +69,13 @@ run_popcon > $POPCON
 
 GPG=/usr/bin/gpg
 
-if [ "$ENCRYPT" = "yes" ] && [ -x "$GPG" ]; then
+if [ "$ENCRYPT" = "yes" ] && ! [ -x "$GPG" ]; then
+  logger -t popularity-contest "encrytion required but gpg is not available."
+  echo "popularity-contest: encrytion required but gpg is not available." 2>&1
+  exit 1
+fi
+
+if [ -x "$GPG" ] && [ "$ENCRYPT" = "maybe" ] || [ "$ENCRYPT" = "yes" ]; then
   POPCONGPG="$POPCON.gpg"
   rm -f "$POPCONGPG"
   GPGHOME=`mktemp -d`