From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 25 Aug 2014 14:01:56 +0000 (-0700)
Subject: Boilerplate: make script quieter when re-scanning files
X-Git-Tag: SQUID_3_5_0_1~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc2321d2bab77dce9895e885d7b75bdf9879b450;p=thirdparty%2Fsquid.git

Boilerplate: make script quieter when re-scanning files

When the copyright blurb is up to date we do not need to display the
entire file. Add a subfunction to only display the message, not file.

Also, note more claimants we need to contact about authorship claims.
---

diff --git a/scripts/boiler-mgr.pl b/scripts/boiler-mgr.pl
index 346e6fddc7..7fa1aac446 100755
--- a/scripts/boiler-mgr.pl
+++ b/scripts/boiler-mgr.pl
@@ -69,7 +69,7 @@ my $reClaimPrefix = qr{
 
 # We have persmission to move these frequent claims to CONTRIBUTORS.
 my $reClaimsOkToMove = qr{
-	Francesco.Chemolli|<kinkie\@squid-cache.org>|
+	Francesco.Chemolli|<kinkie\@squid-cache.org>|<kinkie\@kame.usr.dsi.unimi.it>|
 
 	Amos.Jeffries|<amosjeffries\@squid-cache.org>|<squid3\@treenet.co.nz>|
 	Treehouse.Networks.Ltd.|
@@ -82,6 +82,10 @@ my $reClaimsOkToMove = qr{
 #
 #	Robert.Collins|<robertc\@squid-cache.org>|
 #
+#	Guido Serassio|<serassio\@squid-cache.org>|
+#
+#	Duane Wessels|
+#
 #	the.Regents.of.the.University.of
 
 
@@ -119,8 +123,8 @@ foreach my $fname (@FileNames) {
 	my $code = &readFile($fname) or next;
 	my $virginCode = $code;
 
-	&Warn("Correct boilerplate already present, skipping:", $code), next if
-		$code =~ /\Q$CorrectBoiler\E/s;
+	&WarnQuiet("Correct boilerplate already present, skipping:", $code), next if
+			$code =~ /\Q$CorrectBoiler\E/s;
 
 	my $boiler;
 
@@ -330,3 +334,10 @@ sub Warn() {
 	$msg = sprintf("%s: WARNING: %s\n%s", $FileName, $msg, $context) if defined $FileName;
 	warn($msg);
 }
+
+sub WarnQuiet() {
+	my ($msg, $context) = @_;
+
+	$msg = sprintf("%s: WARNING: %s\n", $FileName, $msg) if defined $FileName;
+	warn($msg);
+}