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

[pere at cvs.alioth.debian.org]

Update of /cvsroot/popcon/popularity-contest/debian
In directory alioth:/tmp/cvs-serv22830/debian

Modified Files:
	changelog postinst 
Log Message:
   [ Petter Reinholdtsen ]
   * Make sure to reinsert the ID if it is missing in the configuration
     file.  Based on bug reported by Alf-Tonny Batz.
   [ Christian Perrier ]
   * Translations:
     - Belarusian added (directly sent by the team)

Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -d -r1.393 -r1.394
--- changelog	12 May 2008 18:11:37 -0000	1.393
+++ changelog	7 Jun 2008 21:26:31 -0000	1.394
@@ -1,5 +1,10 @@
 popularity-contest (1.46) UNRELEASED; urgency=low
 
+  [ Petter Reinholdtsen ]
+  * Make sure to reinsert the ID if it is missing in the configuration
+    file.  Based on bug reported by Alf-Tonny Batz.
+
+  [ Christian Perrier ]
   * Translations:
     - Belarusian added (directly sent by the team)
 

Index: postinst
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/postinst,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- postinst	7 May 2008 16:50:21 -0000	1.20
+++ postinst	7 Jun 2008 21:26:31 -0000	1.21
@@ -74,8 +74,14 @@
 	if [ ! -e $conffile ]; then
 	    generate_conffile
 	else
+	    # If MY_HOSTID is not set, add it.  This is useful when disk images are prepared
+	    if [ -z "$MY_HOSTID" ] ; then
+	        generate_id
+	        echo "MY_HOSTID=\"$MY_HOSTID\"" >> $conffile
+	    fi
+
             OLDHOSTID="$MY_HOSTID";
-            case $MY_HOSTID in
+            case "$MY_HOSTID" in
             # Workaround for bug #237874 triggered on hurd.  The
             # problem was fixed in version 1.15, 2004-03-20.