summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-09-03 22:23:46 +0000
committerrillig <rillig@pkgsrc.org>2005-09-03 22:23:46 +0000
commitc99410f597073898cea722f7481aaf8e2b8f130c (patch)
treec9c820ffc809efa28340b287265ea5d24df22f72 /pkgtools
parent53cebecad562774892198ce08a11c9f7f3296f03 (diff)
downloadpkgsrc-c99410f597073898cea722f7481aaf8e2b8f130c.tar.gz
When RCS Ids are detected in patches, don't suggest the -ko mode, but
ask the user to remove the offending line from the patch.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/files/pkglint.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index f2a9c51196c..f7043dde2c1 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.274 2005/09/03 11:53:15 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.275 2005/09/03 22:23:46 rillig Exp $
#
# This version contains lots of changes necessary for NetBSD packages
# done by:
@@ -1072,7 +1072,7 @@ sub checkfile_patches_patch($$) {
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\$\". Use no-keyword mode (-ko) on cvs add/import.");
+ $line->log_warning("Possible RCS tag \"\$$1\$\". Please try to remove that line from the patch.");
}
}
checklines_trailing_empty_lines($lines);