From ba8dc6e806a43354e443a86abed702098d43807f Mon Sep 17 00:00:00 2001 From: "jocuri%softhome.net" <> Date: Mon, 27 Dec 2004 18:16:50 +0000 Subject: Patch for bug 274650: checksetup flag fixup code shouldn't output text when all is ok and the silent mode is on; patch by Marc Schumann , r=jake, a=justdave. --- checksetup.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'checksetup.pl') diff --git a/checksetup.pl b/checksetup.pl index 18c65ba98..e352e6621 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -3866,7 +3866,7 @@ if (TableExists("attachstatuses") && TableExists("attachstatusdefs")) { # 2004-12-13 Nick.Barnes@pobox.com bug 262268 # Check flag type names for spaces and commas, and rename them. if (TableExists("flagtypes")) { - print "Checking flag type names for spaces and commas...\n"; + print "Checking flag type names for spaces and commas...\n" unless $silent; # Get names and IDs which are broken. $sth = $dbh->prepare("SELECT name, id FROM flagtypes"); @@ -3893,8 +3893,8 @@ if (TableExists("flagtypes")) { if (length($tryflagname) > 50) { my $lastchanceflagname = (substr $tryflagname, 0, 47) . '...'; if (defined($flagtypes{$lastchanceflagname})) { - print " ... last attempt as \"$lastchanceflagname\" still failed.'\n"; - print "Rename the flag by hand and run checksetup.pl again.\n"; + print " ... last attempt as \"$lastchanceflagname\" still failed.'\n", + "Rename the flag by hand and run checksetup.pl again.\n"; die("Bad flag type name $flagname"); } $tryflagname = $lastchanceflagname; @@ -3907,7 +3907,7 @@ if (TableExists("flagtypes")) { } print "... done.\n"; } else { - print "... all flag type names are good.\n"; + print "... all flag type names are good.\n" unless $silent; } } -- cgit v1.2.3-24-g4f1b