diff options
| author | rillig <rillig@pkgsrc.org> | 2005-12-01 09:03:00 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-12-01 09:03:00 +0000 |
| commit | 18b653a43b6fd0dba63fd19daabe79d52c2756b0 (patch) | |
| tree | 5faa37d79ff4d46b98e577de3f6aef4796bfe8d7 /pkgtools | |
| parent | 8db730a26211f94055aaa10c94f5d7d661b4edd0 (diff) | |
| download | pkgsrc-18b653a43b6fd0dba63fd19daabe79d52c2756b0.tar.gz | |
- Made the check for spurious RCS tags in patches less strict. Now it finds
partial tags like $NetBSD:... that don't have a trailing "$".
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index facd9dcaaa6..08955d8731f 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -11,7 +11,7 @@ # Freely redistributable. Absolutely no warranty. # # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp -# $NetBSD: pkglint.pl,v 1.399 2005/12/01 03:12:09 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.400 2005/12/01 09:03:00 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by: @@ -1507,7 +1507,7 @@ sub checkfile_patches_patch($) { checkline_rcsid($lines->[0], ""); foreach my $line (@{$lines}[1..$#{$lines}]) { - if ($line->text =~ qr"\$(Author|Date|Header|Id|Locker|Log|Name|RCSfile|Revision|Source|State|$opt_rcsidstring)(?::[^\$]*?|)\$") { + if ($line->text =~ qr"\$(Author|Date|Header|Id|Locker|Log|Name|RCSfile|Revision|Source|State|$opt_rcsidstring)[:\$]") { my ($tag) = ($1); $line->log_warning("Possible RCS tag \"\$${tag}\$\". Please remove it by reducing the number of context lines using pkgdiff or \"diff -U[210]\"."); } |