pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Changed the wording of the diag...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/082f790f107c
branches:  trunk
changeset: 498827:082f790f107c
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Sep 04 00:33:18 2005 +0000

description:
Changed the wording of the diagnostics message when a patch contains an
RCS tag. Suggested by hubertf.

diffstat:

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

diffs (26 lines):

diff -r a88ad41e5ba1 -r 082f790f107c pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Sun Sep 04 00:26:13 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Sun Sep 04 00:33:18 2005 +0000
@@ -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.276 2005/09/04 00:26:13 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.277 2005/09/04 00:33:18 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1074,10 +1074,9 @@
        checkline_rcsid($lines->[0], "");
 
        foreach my $line (@{$lines}[1..$#{$lines}]) {
-               if ($line->text =~ /$regex_known_rcs_tag/) {
-                       # XXX: see the pkgsrc guide how to fix that
-                       # TODO: that section still needs to be written
-                       $line->log_warning("Possible RCS tag \"\$$1\$\". Please try to remove that line from the patch.");
+               if ($line->text =~ $regex_known_rcs_tag) {
+                       my ($tag) = ($1);
+                       $line->log_warning("Possible RCS tag \"\$${tag}\$\". Please remove it by reducing the number of context lines using pkgdiff or \"diff -U[210]\".");
                }
        }
        checklines_trailing_empty_lines($lines);



Home | Main Index | Thread Index | Old Index