From efd07bd1364267c7e223d9e8bdcad1a201809ed8 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 6 Jul 2012 11:58:55 -0400
Subject: [PATCH] Modify copyright.pl so all lines are processed, not just the
first match, so files that contain embedded copyrights are updated, e.g.
pgsql/help.c.
Backpatch to 9.2.
---
src/tools/copyright.pl | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/tools/copyright.pl b/src/tools/copyright.pl
index 567c041cc58..e879209d8c7 100755
--- a/src/tools/copyright.pl
+++ b/src/tools/copyright.pl
@@ -48,12 +48,10 @@ sub wanted
# We only care about lines with a copyright notice.
next unless $line =~ m/$cc.*$pgdg/;
- # We stop when we've done one substitution. This is both for
- # efficiency and, at least in the case of this program, for
- # correctness.
- last if $line =~ m/$cc.*$year.*$pgdg/;
- last if $line =~ s/($cc\d{4})(, $pgdg)/$1-$year$2/;
- last if $line =~ s/($cc\d{4})-\d{4}(, $pgdg)/$1-$year$2/;
+ # We process all lines because some files have copyright
+ # strings embedded in them, e.g. src/bin/psql/help.c
+ $line =~ s/($cc\d{4})(, $pgdg)/$1-$year$2/;
+ $line =~ s/($cc\d{4})-\d{4}(, $pgdg)/$1-$year$2/;
}
untie @lines;
}
--
GitLab