summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorrillig <rillig>2005-09-04 00:33:18 +0000
committerrillig <rillig>2005-09-04 00:33:18 +0000
commit97867fb20b2f251768db9d3dede140018c0279bd (patch)
treea04ba9c8c6d20268fc504a33a8ccca08c5a0df22 /pkgtools
parent9272057d0603348658e3b9db2e59930b98ab5cbd (diff)
downloadpkgsrc-97867fb20b2f251768db9d3dede140018c0279bd.tar.gz
Changed the wording of the diagnostics message when a patch contains an
RCS tag. Suggested by hubertf.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/files/pkglint.pl9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 1148ae0c47b..53318ec4e03 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.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 @@ sub checkfile_patches_patch($$) {
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);