Commit95203e0

committed

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.

1 parent5198ae8 commit95203e0Copy full SHA for 95203e0

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,10 @@ sub wanted`
`48`	`48`	`# We only care about lines with a copyright notice.`
`49`	`49`	`nextunless$line =~m/$cc.*$pgdg/;`
`50`	`50`
`51`		`-# We stop when we've done one substitution. This is both for`
`52`		`-# efficiency and, at least in the case of this program, for`
`53`		`-# correctness.`
`54`		`-lastif$line =~m/$cc.$year.$pgdg/;`
`55`		`-lastif$line =~s/($cc\d{4})(, $pgdg)/$1-$year$2/;`
`56`		`-lastif$line =~s/($cc\d{4})-\d{4}(, $pgdg)/$1-$year$2/;`
	`51`	`+# We process all lines because some files have copyright`
	`52`	`+# strings embedded in them, e.g. src/bin/psql/help.c`
	`53`	`+$line =~s/($cc\d{4})(, $pgdg)/$1-$year$2/;`
	`54`	`+$line =~s/($cc\d{4})-\d{4}(, $pgdg)/$1-$year$2/;`
`57`	`55`	`}`
`58`	`56`	`untie@lines;`
`59`	`57`	`}`

Comments

(0)