diff options
| author | wiz <wiz@pkgsrc.org> | 2004-07-14 17:43:43 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2004-07-14 17:43:43 +0000 |
| commit | df7e861d9fab4436bf99792a7d22cc48e07adb88 (patch) | |
| tree | 8efb258d866f00a31230a8dedef6a7d348865479 /pkgtools | |
| parent | c736613b0686cb1efbb0b71ada3a83307ddd8443 (diff) | |
| download | pkgsrc-df7e861d9fab4436bf99792a7d22cc48e07adb88.tar.gz | |
Update to 3.88:
Fix some bugs wrt MESSAGE and PLIST checking.
From Roland Illig in private mail.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 20 |
2 files changed, 13 insertions, 11 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 9ab1fe859a1..cfc91ab16d9 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.200 2004/07/10 05:55:50 snj Exp $ +# $NetBSD: Makefile,v 1.201 2004/07/14 17:43:43 wiz Exp $ # -DISTNAME= pkglint-3.87 +DISTNAME= pkglint-3.88 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 3ff612bc026..6f36a394a3c 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.113 2004/07/10 05:55:50 snj Exp $ +# $NetBSD: pkglint.pl,v 1.114 2004/07/14 17:43:43 wiz Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -465,7 +465,7 @@ sub checkfile_MESSAGE($) { checkline_trailing_whitespace($line); checkline_valid_characters($line, $regex_validchars); } - if ($message->[-1] ne "=" x 75) { + if ($message->[-1]->[2] ne "=" x 75) { log_warning($message->[-1]->[0], $message->[-1]->[1], "expected a line of exactly 75 \"=\" characters."); } return 1; @@ -496,14 +496,16 @@ sub checkfile_PLIST($) { $curdir = $arg; } elsif ($cmd eq "unexec" && $arg =~ /^rmdir/) { log_warning($line->[0], $line->[1], "use \"\@dirrm\" instead of \"\@unexec rmdir\"."); - } elsif (($cmd eq "exec" || $cmd eq "unexec") && ($arg =~ /(?:install-info|\$\{INSTALL_INFO\})/)) { - log_warning($line->[0], $line->[1], "\@exec/unexec install-info is deprecated."); - } elsif (($cmd eq "exec" || $cmd eq "unexec") && $arg =~ /ldconfig/) { - if ($arg !~ m:/usr/bin/true:) { + } elsif ($cmd eq "exec" || $cmd eq "unexec") { + if ($arg =~ /(?:install-info|\$\{INSTALL_INFO\})/) { + log_warning($line->[0], $line->[1], "\@exec/unexec install-info is deprecated."); + } elsif ($arg =~ /ldconfig/ && $arg !~ qr"/usr/bin/true") { log_error($line->[0], $line->[1], "ldconfig must be used with \"||/usr/bin/true\"."); } - } elsif ($cmd eq "comment" && $arg =~ /^$regex_rcsidstr$/) { - $rcsid_seen = 1; + } elsif ($cmd eq "comment") { + if ($arg =~ /^$regex_rcsidstr$/) { + $rcsid_seen = 1; + } } elsif ($cmd eq "dirrm" || $cmd eq "option") { # no check made } elsif ($cmd eq "mode" || $cmd eq "owner" || $cmd eq "group") { @@ -1829,7 +1831,7 @@ sub log_info($$$) sub print_summary_and_exit() { if ($errors != 0 || $warnings != 0) { - print("$errors errors and $warnings warnings found.\n"); + print("$errors fatal errors and $warnings warnings found.\n"); } else { print "looks fine.\n"; } |