[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Don't require white-space after...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9c713f6de332
branches:  trunk
changeset: 538185:9c713f6de332
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Jan 31 14:00:17 2008 +0000

description:
Don't require white-space after ${RUN}, since it wasn't required for
${_PKG_SILENT}${_PKG_DEBUG} either.

diffstat:

 pkgtools/pkglint/files/pkglint.pl |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 00688db95a5f -r 9c713f6de332 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Thu Jan 31 13:47:19 2008 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Thu Jan 31 14:00:17 2008 +0000
@@ -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 @@
                ${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 @@
                                "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);