[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-serv15590

Modified Files:
	postinst 
Log Message:
Move code to add USEHTTP option to the start of the block.


Index: postinst
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/postinst,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- postinst	4 Jul 2005 18:39:49 -0000	1.14
+++ postinst	4 Jul 2005 19:17:10 -0000	1.15
@@ -66,6 +66,15 @@
 	if [ ! -e $conffile ]; then
 	    generate_conffile
 	else
+	    # Make sure the config file have the USEHTTP entry if we
+	    # are to enable HTTP.
+	    if [ "yes" = "$USEHTTP" ] ; then
+		if grep -q USEHTTP $conffile; then
+		    :
+		else
+		    echo "USEHTTP=\"$USEHTTP\"" >> $conffile
+		fi
+	    fi
 
             OLDHOSTID="$MY_HOSTID";
             case $MY_HOSTID in
@@ -79,16 +88,6 @@
             esac;
 	    # Replace only if the content changed, to avoid changing the
 	    # config file date when no change was done.
-
-	    # Make sure the config file have the USEHTTP entry if we
-	    # are to enable HTTP.
-	    if [ "yes" = "$USEHTTP" ] ; then
-		if grep -q USEHTTP $conffile; then
-		    :
-		else
-		    echo "USEHTTP=\"$USEHTTP\"" >> $conffile
-		fi
-	    fi
 
 	    # Commenting out the obsolete addresses, to use the
 	    # default config from /usr/share/ on hosts where