Sun Dec 14 18:46:58 2008 UTC ()
Changed one of the explanations to be more permissive. Fixed a
grammatical mistake in the same sentence.


(rillig)
diff -r1.794 -r1.795 pkgsrc/pkgtools/pkglint/files/pkglint.pl

cvs diff -r1.794 -r1.795 pkgsrc/pkgtools/pkglint/files/Attic/pkglint.pl (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/files/Attic/pkglint.pl 2008/12/05 06:48:05 1.794
+++ pkgsrc/pkgtools/pkglint/files/Attic/pkglint.pl 2008/12/14 18:46:58 1.795
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#! @PERL@ 1#! @PERL@
2# $NetBSD: pkglint.pl,v 1.794 2008/12/05 06:48:05 wiz Exp $ 2# $NetBSD: pkglint.pl,v 1.795 2008/12/14 18:46:58 rillig Exp $
3# 3#
4 4
5# pkglint - static analyzer and checker for pkgsrc packages 5# pkglint - static analyzer and checker for pkgsrc packages
6# 6#
7# Written by: 7# Written by:
8# Roland Illig <rillig@NetBSD.org> 8# Roland Illig <rillig@NetBSD.org>
9# 9#
10# Based on work by: 10# Based on work by:
11# Hubert Feyrer <hubertf@NetBSD.org> 11# Hubert Feyrer <hubertf@NetBSD.org>
12# Thorsten Frueauf <frueauf@NetBSD.org> 12# Thorsten Frueauf <frueauf@NetBSD.org>
13# Thomas Klausner <wiz@NetBSD.org> 13# Thomas Klausner <wiz@NetBSD.org>
14# and others. 14# and others.
15# 15#
@@ -5061,28 +5061,28 @@ sub checkline_mk_vartype_basic($$$$$$$$) @@ -5061,28 +5061,28 @@ sub checkline_mk_vartype_basic($$$$$$$$)
5061 5061
5062 } elsif ($type eq "Option") { 5062 } elsif ($type eq "Option") {
5063 if ($value ne $value_novar) { 5063 if ($value ne $value_novar) {
5064 $opt_debug_unchecked and $line->log_debug("Unchecked option name \"${value}\"."); 5064 $opt_debug_unchecked and $line->log_debug("Unchecked option name \"${value}\".");
5065 5065
5066 } elsif ($value_novar =~ m"^-?([a-z][-0-9a-z]*)$") { 5066 } elsif ($value_novar =~ m"^-?([a-z][-0-9a-z]*)$") {
5067 my ($optname) = ($1); 5067 my ($optname) = ($1);
5068 5068
5069 if (!exists(get_pkg_options()->{$optname})) { 5069 if (!exists(get_pkg_options()->{$optname})) {
5070 $line->log_warning("Unknown option \"${value}\"."); 5070 $line->log_warning("Unknown option \"${value}\".");
5071 $line->explain_warning( 5071 $line->explain_warning(
5072"This option is not documented in the mk/defaults/options.description", 5072"This option is not documented in the mk/defaults/options.description",
5073"file. If this is not a typo, please think of a brief but precise", 5073"file. If this is not a typo, please think of a brief but precise",
5074"description and ask on the tech-pkg\@NetBSD.org for inclusion in the", 5074"description and either update that file yourself or ask on the",
5075"database."); 5075"tech-pkg\@NetBSD.org mailing list.");
5076 } 5076 }
5077 5077
5078 } elsif ($value_novar =~ m"^-?([a-z][-0-9a-z_]*)$") { 5078 } elsif ($value_novar =~ m"^-?([a-z][-0-9a-z_]*)$") {
5079 my ($optname) = ($1); 5079 my ($optname) = ($1);
5080 5080
5081 $line->log_warning("Use of the underscore character in option names is deprecated."); 5081 $line->log_warning("Use of the underscore character in option names is deprecated.");
5082 5082
5083 } else { 5083 } else {
5084 $line->log_error("\"${value}\" is not a valid option name."); 5084 $line->log_error("\"${value}\" is not a valid option name.");
5085 } 5085 }
5086 5086
5087 } elsif ($type eq "Pathlist") { 5087 } elsif ($type eq "Pathlist") {
5088 5088