summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-08-06 22:41:07 +0000
committerrillig <rillig@pkgsrc.org>2005-08-06 22:41:07 +0000
commite5aadae863d1ea6c3edd96fd9bfda93119df2715 (patch)
tree2a68ddfa160761016ccd5abd5c6355949884a736 /pkgtools
parent810752a20e21035c32637f9208e989159c16ed02 (diff)
downloadpkgsrc-e5aadae863d1ea6c3edd96fd9bfda93119df2715.tar.gz
Fixed a bug which led to an endless loop. While happily changing the
code, I had forgotten one assumption I made. It was that in the ifelse chain the case ( && ) couldn't occur because the outer loop already cought that. And then I had inserted code that violated exactly this assumption. Fixed.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/files/pkglint.pl5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 58b927bd20c..989eee678c0 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.234 2005/08/06 22:24:07 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.235 2005/08/06 22:41:07 rillig Exp $
#
# This version contains lots of changes necessary for NetBSD packages
# done by:
@@ -2108,7 +2108,6 @@ sub check_category($) {
} elsif ($is_wip && $line->text eq "") {
# ignore the special case "wip", which defines its own "index" target.
- $lines_atend = true;
} else {
$line->log_error("SUBDIR+= line expected.");
@@ -2133,7 +2132,7 @@ sub check_category($) {
$fetch_next_line = true;
}
- if ($lines_index == $#{$lines} - 1) {
+ if ($lines_index == $#{$lines} - 1 || ($is_wip && $line->text eq "")) {
$lines_atend = true;
}
$filesys_atend = ($filesys_index == @filesys_subdirs);