diff options
author | rillig <rillig> | 2005-08-17 10:55:22 +0000 |
---|---|---|
committer | rillig <rillig> | 2005-08-17 10:55:22 +0000 |
commit | f458d1392ead457a9198f1d9a0dfc23fbaf332f0 (patch) | |
tree | d4ee71cca1d5fd147248731a0f17d372ebda6c1f | |
parent | e0feff3746a854b664d247f2c162d7516d5aac09 (diff) | |
download | pkgsrc-f458d1392ead457a9198f1d9a0dfc23fbaf332f0.tar.gz |
Renamed check_{package,category} to checkdir_{package,category} to
distinguish them from the checkfile_* and checklines_* subroutines.
-rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 84df5442e27..ca8f56a2392 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.239 2005/08/17 10:49:59 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.240 2005/08/17 10:55:22 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by: @@ -376,8 +376,8 @@ sub checkfile_MESSAGE($$); sub checkfile_patches_patch($$); sub checkfile_PLIST($$); -sub check_category($); -sub check_package($); +sub checkdir_category($); +sub checkdir_package($); sub checkperms($); sub readmakefile($$$$); @@ -550,7 +550,7 @@ sub load_predefined_sites($) { return $predefined_sites; } -sub check_package($) { +sub checkdir_package($) { my ($dir) = @_; my ($whole, $lines, $have_distinfo, $have_patches); @@ -2086,7 +2086,7 @@ sub check_predefined_sites($$) { log_info(NO_FILE, NO_LINE_NUMBER, "URL does not match any of the predefined URLS. Good."); } -sub check_category($) { +sub checkdir_category($) { my ($dir) = @_; my $fname = "${dir}/Makefile"; my ($lines, $lineno, $is_wip, @normalized_lines, $can_fix); @@ -2297,11 +2297,11 @@ sub check_directory($) { if (-f "${dir}/../mk/bsd.pkg.mk") { log_info(NO_FILE, NO_LINE_NUMBER, "Checking category Makefile."); - check_category($dir); + checkdir_category($dir); } elsif (-f "${dir}/../../mk/bsd.pkg.mk") { load_predefined_sites("${dir}/../.."); - check_package($dir); + checkdir_package($dir); } else { log_error($dir, NO_LINE_NUMBER, "Neither a package nor a category."); |