pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files - The variables *_USER and *_GR...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/eee246ec02a1
branches:  trunk
changeset: 511341:eee246ec02a1
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Apr 13 01:57:35 2006 +0000

description:
- The variables *_USER and *_GROUP don't need the :Q operator.
- Fixed a bug in the regular expression that detects sed(1) commands that
  don't start with "-e".

diffstat:

 pkgtools/pkglint/files/pkglint.pl |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 053b73ab9ff6 -r eee246ec02a1 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Thu Apr 13 01:41:51 2006 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Thu Apr 13 01:57:35 2006 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.555 2006/04/12 21:35:02 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.556 2006/04/13 01:57:35 rillig Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -2069,7 +2069,7 @@
 sub variable_needs_quoting($) {
        my ($varname) = @_;
 
-       return !($varname =~ qr"^(?:.*DIR|BUILDLINK_PREFIX\..*|DISTNAME|LOCALBASE|PKGNAME|PREFIX|WRKSRC)$");
+       return !($varname =~ qr"^(?:.*DIR|.*_GROUP|.*_USER|BUILDLINK_PREFIX\..*|DISTNAME|LOCALBASE|PKGNAME|PREFIX|WRKSRC)$");
 }
 
 my $check_pkglint_version_done = false;
@@ -3262,7 +3262,7 @@
                                } elsif ($word eq "-n") {
                                        # Don't print lines per default.
 
-                               } elsif ($i == 0 && $word =~ qr"^([\"']?)\d*s(.).*\2\1g?$") {
+                               } elsif ($i == 0 && $word =~ qr"^([\"']?)\d*s(.).*\2g?\1$") {
                                        $line->log_warning("Please always use \"-e\" in sed commands, even if there is only one substitution.");
 
                                } else {



Home | Main Index | Thread Index | Old Index