[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-serv19564/debian

Modified Files:
	postinst 
Log Message:
Fix bogus MY_HOSTID generated by popcon releases affected by #203841.
Remove check for an impossible error condition.


Index: postinst
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/postinst,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- postinst	13 Apr 2004 16:51:02 -0000	1.10
+++ postinst	13 Apr 2004 22:03:04 -0000	1.11
@@ -32,11 +32,6 @@
         else
 	        MY_HOSTID=`dd if=/dev/urandom bs=1k count=1 2>/dev/null | md5sum | sed 's/  -//'''`
         fi
-        if [ "$MY_HOSTID" == "$EMPTYID" ] ; then
-            db_input critical popularity-contest/hostid-failed || [ $? -eq 30 ]
-            db_go || true
-            exit 1
-        fi
 }
 
 generate_conffile() {
@@ -65,12 +60,16 @@
 	    generate_conffile
 	else
 
+            OLDHOSTID="$MY_HOSTID";
+            case $MY_HOSTID in
             # Workaround for bug #237874 triggered on hurd.  The
             # problem was fixed in version 1.15, 2004-03-20.
-            if [ "$MY_HOSTID" == "$EMPTYID" ] ; then
-                generate_id
-            fi
 
+              $EMPTYID) generate_id;;
+            # Workaround for bug #240603 triggered by md5sums change
+            # of behaviour with stdin. version 1.17, 2004-04-12.
+              *-)  MY_HOSTID="${MY_HOSTID%  -}";;
+            esac;
 	    # Replace only if the content changed, to avoid changing the
 	    # config file date when no change was done.
 
@@ -84,8 +83,12 @@
 		s/^\(MAILTO=\"erich-survey@debian.org\"\)$/#\1/;    \
 		s/^\(MAILTO=\"apenwarr-survey@debian.org\"\)$/#\1/; \
 		s/^\(MAILTO=\"survey@popcon.debian.org\"\)$/#\1/;   \
-		s/^MY_HOSTID=\"\\?$EMPTYID\"\\?/MY_HOSTID=\"$MY_HOSTID\"/; \
+                "
+            if [ "$OLDHOSTID" != "$MY_HOSTID" ]; then
+                sedopts="$sedopts \
+                s/^MY_HOSTID=\"\\?$OLDHOSTID\"\\?/MY_HOSTID=\"$MY_HOSTID\"/; \
 		"
+            fi
 
 	    if sed "$sedopts" < $conffile > $conffile.new &&
 		! cmp $conffile $conffile.new > /dev/null; then