Created attachment 285874 [details]
Test case

User-Agent:       Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.8) Gecko/2009032609 Firefox/3.0.8

In certain cases, running fillup -x causes comments to be randomly relocated or deleted.

This is demonstrated with fillup-1.42-242.14 (provided with openSUSE 11.1).

I've included a simple test case that demonstrates the problem. What this test case is supposed to do is override a few variables in a copy of /etc/sysconfig/SuSEfirewall2 and then display the diff.

The variables do in fact get overridden, but there are a few other random changes to comments that should not have been applied, shown below.

Note how one comment chunk got relocated to the beginning of the file, while another smaller one was just deleted.


--- file1	2009-04-14 09:58:50.000000000 -0500
+++ -	2009-04-15 09:04:43.583523849 -0500
@@ -1,3 +1,20 @@
+
+## Type: string
+## Default:
+#
+# Services to allow. This is a more generic form of FW_SERVICES_{IP,UDP,TCP}
+# and more specific than FW_TRUSTED_NETS
+#
+# Format: space separated list of net,protocol[,dport[,sport[,flags]]]
+# Example: "0/0,tcp,22"
+#
+# Supported flags are
+#   hitcount=NUMBER     : ipt_recent --hitcount parameter
+#   blockseconds=NUMBER : ipt_recent --seconds parameter
+#   recentname=NAME     : ipt_recent --name parameter
+#   FW_DEV_wlan="wlan0"
+#   FW_SERVICES_wlan_TCP="80"
+#   FW_ALLOW_FW_BROADCAST_wlan="yes"
 # Copyright (c) 2000-2002 SuSE GmbH Nuernberg, Germany.  All rights reserved.
 # Copyright (c) 2003,2004 SuSE Linux AG Nuernberg, Germany.  All rights reserved.
 # Copyright (c) 2005-2008 SUSE LINUX Products GmbH Nuernberg, Germany.  All rights reserved.
@@ -446,20 +463,6 @@
 #
 # see FW_SERVICES_REJECT_EXT
 FW_SERVICES_REJECT_INT=""
-
-## Type: string
-## Default:
-#
-# Services to allow. This is a more generic form of FW_SERVICES_{IP,UDP,TCP}
-# and more specific than FW_TRUSTED_NETS
-#
-# Format: space separated list of net,protocol[,dport[,sport[,flags]]]
-# Example: "0/0,tcp,22"
-#
-# Supported flags are
-#   hitcount=NUMBER     : ipt_recent --hitcount parameter
-#   blockseconds=NUMBER : ipt_recent --seconds parameter
-#   recentname=NAME     : ipt_recent --name parameter
 # Example:
 #    Allow max three ssh connects per minute from the same IP address:
 #      "0/0,tcp,22,,hitcount=3,blockseconds=60,recentname=ssh"
@@ -1100,9 +1103,6 @@
 #
 # Example:
 #   FW_ZONES="wlan"
-#   FW_DEV_wlan="wlan0"
-#   FW_SERVICES_wlan_TCP="80"
-#   FW_ALLOW_FW_BROADCAST_wlan="yes"
 #
 FW_ZONES=""
 



Reproducible: Always

Steps to Reproduce:
1. Unpack attached test case
2. Execute the script "run.sh"
3. Notice the diff(1) output shows extra changes that should not be there
Actual Results:  
See description.


Expected Results:  
No comment changes.