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

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

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

Modified Files:
	changelog config 
Log Message:
Only ask about submission method when going to participate.

Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- changelog	6 Jul 2005 14:16:45 -0000	1.205
+++ changelog	6 Jul 2005 14:48:37 -0000	1.206
@@ -19,6 +19,7 @@
   * Depend on ${misc:Depends} instead of debconf, to get the updated
     debconf dependency.
   * Added low priority debconf question asking if http should be used.
+    Only ask this question if participating.
   * Added 30 second timeout in the http upload script.
   * Rewrite the participation template text, to only talk about
     submissions and not emails, to make it neutral to the submission

Index: config
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/config,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- config	3 Jul 2005 10:16:44 -0000	1.8
+++ config	6 Jul 2005 14:48:37 -0000	1.9
@@ -24,5 +24,9 @@
 db_input high popularity-contest/participate || [ $? -eq 30 ]
 db_go || true
 
-db_input low popularity-contest/use-http || [ $? -eq 30 ]
-db_go || true
+# Only ask about the method if the user want to participate.
+db_get popularity-contest/participate || true
+if [ "$RET" = "yes" ] || [ "$RET" = "YES" ] || [ "$RET" = "true" ]; then
+    db_input low popularity-contest/use-http || [ $? -eq 30 ]
+    db_go || true
+fi