diff options
| author | rillig <rillig> | 2005-08-17 10:49:59 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-08-17 10:49:59 +0000 |
| commit | b83f83c76ccfdd34dd366fc85e05078121803847 (patch) | |
| tree | de889422c49a6b0a0e807bac996858b4c436f001 /pkgtools | |
| parent | 7fdafe7c15d9197d6e82335d0f5d6c878aa16a61 (diff) | |
| download | pkgsrc-b83f83c76ccfdd34dd366fc85e05078121803847.tar.gz | |
Fixed some bugs that appeared while checking the databases/ category
Makefile.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 0d078fd94a0..84df5442e27 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.238 2005/08/17 10:42:51 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.239 2005/08/17 10:49:59 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by: @@ -2165,13 +2165,14 @@ sub check_category($) { if (defined($prev_subdir) && $subdir eq $prev_subdir) { $line->log_error("${subdir} must only appear once."); - } elsif (defined($prev_subdir) && $subdir le $prev_subdir) { + } elsif (defined($prev_subdir) && $subdir lt $prev_subdir) { $line->log_error("${subdir} must come before ${prev_subdir}."); } else { # correctly ordered } push(@m_subdirs, [$subdir, $line]); + $prev_subdir = $subdir; $lineno++; } else { @@ -2187,7 +2188,7 @@ sub check_category($) { # subdirs of each list. my (%f_check, %m_check); foreach my $f (@f_subdirs) { $f_check{$f} = true; } - foreach my $m (@m_subdirs) { $m_check{$m} = true; } + foreach my $m (@m_subdirs) { $m_check{$m->[0]} = true; } my ($f_index, $f_atend, $f_neednext, $f_current) = (0, false, true, undef, undef); my ($m_index, $m_atend, $m_neednext, $m_current) = (0, false, true, undef, undef); |