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

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

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

Modified Files:
	changelog postinst 
Log Message:
Use uuidgen in postinst to get a random HOSTID. (Closes: #237874)
Add MY_HOSTID sanity chech to popularity-contest.
Only label sundays in the graphs.


Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- changelog	14 Mar 2004 22:43:26 -0000	1.74
+++ changelog	15 Mar 2004 15:16:54 -0000	1.75
@@ -2,6 +2,8 @@
 
   * Bill Allombert
     - Invalidate the submissions after 20 days instead of 10.
+    - Use uuidgen in postinst to get a random HOSTID. (Closes: #237874)
+    - Add MY_HOSTID sanity chech to popularity-contest.
   * Petter Reinholdtsen
     - Updated Norwegian Bokmål and Nynorsk debconf translation,
       patch from Håvard Korsvoll. (Closes: #238037)

Index: postinst
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/postinst,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- postinst	26 Jan 2004 21:51:14 -0000	1.7
+++ postinst	15 Mar 2004 15:16:54 -0000	1.8
@@ -24,7 +24,11 @@
 fi
 
 generate_conffile() {
-	MY_HOSTID=`dd if=/dev/urandom bs=1k count=1 2>/dev/null | md5sum | sed 's/  -//'''`
+        if [ -x /usr/bin/uuidgen ] ; then
+                MY_HOSTID=`uuidgen | tr -d -`
+        else
+	        MY_HOSTID=`dd if=/dev/urandom bs=1k count=1 2>/dev/null | md5sum | sed 's/  -//'''`
+        fi
 
 	cat <<-EOF >$conffile
 		# Config file for Debian's popularity-contest package.