diff options
| author | rillig <rillig> | 2008-01-31 14:00:17 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2008-01-31 14:00:17 +0000 |
| commit | 6e3108610d70daf19673a07a39bde6af2bbdebfc (patch) | |
| tree | 8db02efac18c10e5200f0764d8a173e881993985 /pkgtools | |
| parent | 3b02a7c898b73121beee16eae518023a2b603276 (diff) | |
| download | pkgsrc-6e3108610d70daf19673a07a39bde6af2bbdebfc.tar.gz | |
Don't require white-space after ${RUN}, since it wasn't required for
${_PKG_SILENT}${_PKG_DEBUG} either.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 61d37250e6d..764ae9cd275 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.761 2008/01/31 13:20:56 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.762 2008/01/31 14:00:17 rillig Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -4605,8 +4605,10 @@ sub checkline_mk_shelltext($$) { ${WARNING_CAT} ${WARNING_MSG} )); - if ($rest =~ s/^\s*([-@]*)(?:\$\{_PKG_SILENT\}\$\{_PKG_DEBUG\})?//) { - my ($hidden) = ($1); + $set_e_mode = false; + + if ($rest =~ s/^\s*([-@]*)(\$\{_PKG_SILENT\}\$\{_PKG_DEBUG\}|\${RUN}|)//) { + my ($hidden, $macro) = ($1, $2); if ($hidden !~ qr"\@") { # Nothing is hidden at all. @@ -4633,10 +4635,13 @@ sub checkline_mk_shelltext($$) { "all errors you never thought of), append \"|| \${TRUE}\" to the", "command."); } + + if ($macro eq "\${RUN}") { + $set_e_mode = true; + } } $state = SCST_START; - $set_e_mode = false; while ($rest =~ s/^$regex_shellword//) { my ($shellword) = ($1); |