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

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

Update of /cvsroot/popcon/popularity-contest/debian
In directory quantz:/tmp/cvs-serv28595/debian

Modified Files:
	changelog config 
Log Message:
Make sure db_input do not fail if the question already was
displayed earlier.  (Closes: #229091, #229092)


Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- changelog	22 Jan 2004 22:56:32 -0000	1.29
+++ changelog	22 Jan 2004 23:10:40 -0000	1.30
@@ -3,6 +3,8 @@
   * Petter Reinholdtsen
     - Report error in popcon-largest-unused if
       /var/log/popularity-contest is missing.
+    - Make sure db_input do not fail if the question already was
+      displayed earlier.  (Closes: #229091, #229092)
 
  -- Bill Allombert <ballombe@debian.org>  Thu, 22 Jan 2004 22:18:38 +0100
 

Index: config
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config	21 Jan 2004 23:29:41 -0000	1.2
+++ config	22 Jan 2004 23:10:40 -0000	1.3
@@ -14,15 +14,15 @@
        db_set popularity-contest/participate "$PARTICIPATE"
 fi
 
-db_input medium popularity-contest/intro || true
+db_input medium popularity-contest/intro || [ $? -eq 30 ]
 db_go || true
 
-db_input medium popularity-contest/participate || true
+db_input medium popularity-contest/participate || [ $? -eq 30 ]
 db_go || true
 
 # Ask if the old addresses should be changed to the new address.
 if [ "$MAILTO" = "erich-survey@debian.org" -o \
      "$MAILTO" = "apenwarr-survey@debian.org" ]; then
-    db_input high popularity-contest/update-mailto
+    db_input high popularity-contest/update-mailto || [ $? -eq 30 ]
     db_go || true
 fi