diff options
| author | rillig <rillig@pkgsrc.org> | 2005-09-01 23:24:35 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-09-01 23:24:35 +0000 |
| commit | 1c2f92a2b4a74f07517268c93ee0897f0e542fa9 (patch) | |
| tree | af22265a496f6d184a031da70edbe0b1411cefec /pkgtools | |
| parent | 772fe054705ef8e808a831f0151b8bc9152fa9c6 (diff) | |
| download | pkgsrc-1c2f92a2b4a74f07517268c93ee0897f0e542fa9.tar.gz | |
Fixed a newly introduced bug that prevented multiple patches per file from
being detected.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index dee4ffa94bc..1e6049b0be9 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.263 2005/09/01 22:45:16 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.264 2005/09/01 23:24:35 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by: @@ -963,6 +963,7 @@ sub check_for_multiple_patches($) { my $text = $line->text; if ($text =~ qr"^@@ -\d+,(\d+) \+\d+,\d+ @@") { + $line_type = ""; $dellines = $1; } elsif ($dellines == 0 && index($text, "--- ") == 0 && $text !~ qr"^--- \d+(?:,\d+|) ----$") { @@ -976,6 +977,7 @@ sub check_for_multiple_patches($) { $line_type = "+"; } elsif ($dellines > 0 && $text =~ qr"^(?:-|\s)") { + $line_type = ""; $dellines--; } else { |