diff options
| author | wiz <wiz@pkgsrc.org> | 2000-06-21 23:28:27 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2000-06-21 23:28:27 +0000 |
| commit | 152d0eca67bd5106a4d8f5031dcbb5a3fbc11d61 (patch) | |
| tree | 075a82b54ed38ac3564b6d7dd33b5343e8af64b5 /pkgtools | |
| parent | 5c2c2392c228bc2d04bfa433823546f5090cada1 (diff) | |
| download | pkgsrc-152d0eca67bd5106a4d8f5031dcbb5a3fbc11d61.tar.gz | |
Update to 2.10. Change: FATAL warnings for empty pkg/COMMENT and pkg/DESCR.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 20 |
2 files changed, 15 insertions, 9 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 9cff41b964f..ed47f1bd336 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.50 2000/06/02 06:20:40 rh Exp $ +# $NetBSD: Makefile,v 1.51 2000/06/21 23:28:27 wiz Exp $ # -DISTNAME= pkglint-2.09 +DISTNAME= pkglint-2.10 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index a168dc321fb..17f166ae6f0 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -12,7 +12,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.30 2000/06/02 06:20:41 rh Exp $ +# $NetBSD: pkglint.pl,v 1.31 2000/06/21 23:28:28 wiz Exp $ # # This version contains some changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org> and @@ -517,13 +517,19 @@ sub checklastline { while (<IN>) { $whole .= $_; } - if ($whole !~ /\n$/) { - &perror("FATAL: the last line of $file has to be ". - "terminated by \\n."); + if ($whole eq "") { + &perror("FATAL: $file is empty."); } - if ($whole =~ /\n([ \t]*\n)+$/) { - &perror("WARN: $file seems to have unnecessary blank lines ". - "at the last part."); + else + { + if ($whole !~ /\n$/) { + &perror("FATAL: the last line of $file has to be ". + "terminated by \\n."); + } + if ($whole =~ /\n([ \t]*\n)+$/) { + &perror("WARN: $file seems to have unnecessary ". + "blank lines at the last part."); + } } close(IN); |