[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 haydn:/tmp/cvs-serv1662

Modified Files:
	changelog config postinst templates 
Log Message:
Added low priority debconf question asking if http should be used.

Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- changelog	3 Jul 2005 07:28:46 -0000	1.191
+++ changelog	3 Jul 2005 10:16:44 -0000	1.192
@@ -17,6 +17,7 @@
   * Added simple FAQ entry about the http POST feature.
   * Depend on ${misc:Depends} instead of debconf, to get the updated
     debconf dependency.
+  * Added low priority debconf question asking if http should be used.
   * TODO:
       + Edit popcon-submit.cgi to report to the main server
       + Add timeout in the upload script.

Index: config
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/config,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- config	30 Jan 2004 23:20:47 -0000	1.7
+++ config	3 Jul 2005 10:16:44 -0000	1.8
@@ -12,7 +12,17 @@
                PARTICIPATE=false
        fi
        db_set popularity-contest/participate "$PARTICIPATE"
+
+       if [ yes = "$USEHTTP" ] ; then
+               USEHTTP=true
+       else
+               USEHTTP=false
+       fi
+       db_set popularity-contest/use-http "$USEHTTP"
 fi
 
 db_input high popularity-contest/participate || [ $? -eq 30 ]
+db_go || true
+
+db_input low popularity-contest/use-http || [ $? -eq 30 ]
 db_go || true

Index: postinst
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/postinst,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- postinst	8 Aug 2004 15:30:43 -0000	1.12
+++ postinst	3 Jul 2005 10:16:44 -0000	1.13
@@ -22,6 +22,12 @@
 else
     PARTICIPATE="no"
 fi
+db_get popularity-contest/use-http || true
+if [ "$RET" = "yes" ] || [ "$RET" = "YES" ] || [ "$RET" = "true" ]; then
+    USEHTTP="yes"
+else
+    USEHTTP="no"
+fi
 
 # The md5 sum of an empty file
 EMPTYID="d41d8cd98f00b204e9800998ecf8427e"
@@ -49,6 +55,7 @@
 		
 		MY_HOSTID="$MY_HOSTID"
 		PARTICIPATE="$PARTICIPATE"
+		USEHTTP="$USEHTTP"
 	EOF
 	# Make sure user nobody can read the file.
 	chmod a+r $conffile
@@ -80,6 +87,7 @@
 
 	    sedopts=" \
 		s/^PARTICIPATE=.*$/PARTICIPATE=\"$PARTICIPATE\"/;   \
+		s/^USEHTTP=.*$/USEHTTP=\"$USEHTTP\"/;   \
 		s/^\(MAILTO=\"erich-survey@debian.org\"\)$/#\1/;    \
 		s/^\(MAILTO=\"apenwarr-survey@debian.org\"\)$/#\1/; \
 		s/^\(MAILTO=\"survey@popcon.debian.org\"\)$/#\1/;   \

Index: templates
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/templates,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- templates	8 Aug 2004 15:57:42 -0000	1.10
+++ templates	3 Jul 2005 10:16:44 -0000	1.11
@@ -12,6 +12,11 @@
  You can always change your mind after making this decision:
  "dpkg-reconfigure popularity-contest"
 
+Template: popularity-contest/use-http
+Type: boolean
+Default: false
+_Description: Use HTTP to submit reports?
+
 Template: popularity-contest/hostid-failed
 Type: note
 _Description: Generating unique host identifier failed