diff options
| author | wiz <wiz@pkgsrc.org> | 2004-02-23 12:33:29 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2004-02-23 12:33:29 +0000 |
| commit | 483d79750e8e67a8a9b8fdf92d361bd01da945f0 (patch) | |
| tree | 9fe9c6f1477de11827ed30d221bce04172cd2c25 /pkgtools/pkglint | |
| parent | a84593d524da413f00f90aabc834c41611b28d30 (diff) | |
| download | pkgsrc-483d79750e8e67a8a9b8fdf92d361bd01da945f0.tar.gz | |
Improve pattern matching for possible RCS Ids
to always check for a terminating dollar sign. Welcome to 3.68.
Diffstat (limited to 'pkgtools/pkglint')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 1abbc15bc29..b167f2fef97 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.178 2004/02/19 21:22:02 markd Exp $ +# $NetBSD: Makefile,v 1.179 2004/02/23 12:33:29 wiz Exp $ # -DISTNAME= pkglint-3.67 +DISTNAME= pkglint-3.68 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 1236c34553e..3c53c0193f8 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.97 2004/01/22 08:09:11 grant Exp $ +# $NetBSD: pkglint.pl,v 1.98 2004/02/23 12:33:29 wiz Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -548,7 +548,7 @@ sub checkpatch { $rcsidseen++ if /\$$rcsidstr[:\$]/; $whole .= $_; } - if ($committer && $whole =~ /.\$(Author|Date|Header|Id|Locker|Log|Name|RCSfile|Revision|Source|State|NetBSD)[:\$]/) { # XXX + if ($committer && $whole =~ /.\$(Author|Date|Header|Id|Locker|Log|Name|RCSfile|Revision|Source|State|NetBSD)(:.*\$|\$)/) { # XXX # RCS ID in very first line is ok, to identify version # of patch (-> only warn if there's something before the # actual $RCS_ID$, not on BOF - '.' won't match there) |