Bug 143040 - Tidy up remove parameters message in checksetup.pl. Patch by gerv; r=justdave, ddk.

2 files changed, 12 insertions, 16 deletions

diff --git a/checksetup.pl b/checksetup.pl
index 1883a5324..62386fca6 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -903,22 +903,27 @@ if (-e "data/params") {
     require "data/params";
     require "defparams.pl";
     use vars @::param_list;
+    my @oldparams;
+    
     open(PARAMFILE, ">>old-params.txt") 
       || die "$0: Can't open old-params.txt for writing: $!\n";
       
     foreach my $item (keys %::param) {
         if (!grep($_ eq $item, @::param_list) && $item ne "version") {
-            print "The $item parameter is no longer used in Bugzilla,
-                   so it has been removed from your parameters file and
-                   written to old-params.txt.\n";
-            
-            print PARAMFILE "\n\n$item:\n";
-            print PARAMFILE $::param{$item};
+            push (@oldparams, $item);
+            print PARAMFILE "\n\n$item:\n$::param{$item}\n";
                 
             delete $::param{$item};
         }
     }
     
+    if (@oldparams) {
+        print "The following parameters are no longer used in Bugzilla, " .
+              "and so have been\nremoved from your parameters file and " .
+              "appended to old-params.txt:\n";
+        print join(", ", @oldparams) . "\n\n";               
+    }
+    
     close PARAMFILE;
     WriteParams();
 }
diff --git a/defparams.pl b/defparams.pl
index 2c6b8b889..fbd9631d2 100644
--- a/defparams.pl
+++ b/defparams.pl
@@ -54,16 +54,7 @@ sub WriteParams {
             }
         }
     }
-    # If Bugzilla has been upgraded since the last time parameters were edited,
-    # and some parameters have been removed in the new version of Bugzilla,
-    # remove them from the parameters file.
-    foreach my $item (keys %::param) {
-        if (!grep($_ eq $item, @::param_list) && $item ne "version") {
-            print "The <em>$item</em> parameter is no longer used in Bugzilla
-              and has been removed from your parameters file.<br>";
-            delete $::param{$item};
-        }
-    }
+
     my $tmpname = "data/params.$$";
     open(FID, ">$tmpname") || die "Can't create $tmpname";
     my $v = $::param{'version'};