summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2020-05-18 19:11:16 +0000
committerrillig <rillig@pkgsrc.org>2020-05-18 19:11:16 +0000
commit3233cf11aef91efb04aeb47416e45c6e9dceb4ef (patch)
treeb8c837ac7de6679f0aa71a7404e2cce714f5464c /pkgtools
parent03b4e0a0bd045e9e12983172dc32c48c69c9edeb (diff)
downloadpkgsrc-3233cf11aef91efb04aeb47416e45c6e9dceb4ef.tar.gz
pkgtools/pkglint: update to 20.1.7
Changes since 20.1.6: Versioned Python dependencies may end with :test or :tool, as the code in lang/python/versioned_dependencies.mk says.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/Makefile4
-rw-r--r--pkgtools/pkglint/files/vartypecheck.go9
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index cdfe8c7c8b1..2334ffb7cf0 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.645 2020/05/17 07:07:18 rillig Exp $
+# $NetBSD: Makefile,v 1.646 2020/05/18 19:11:16 rillig Exp $
-PKGNAME= pkglint-20.1.6
+PKGNAME= pkglint-20.1.7
CATEGORIES= pkgtools
DISTNAME= tools
MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/}
diff --git a/pkgtools/pkglint/files/vartypecheck.go b/pkgtools/pkglint/files/vartypecheck.go
index 06d195b00a0..9c5d8691966 100644
--- a/pkgtools/pkglint/files/vartypecheck.go
+++ b/pkgtools/pkglint/files/vartypecheck.go
@@ -1143,13 +1143,16 @@ func (cv *VartypeCheck) PrefixPathname() {
func (cv *VartypeCheck) PythonDependency() {
if cv.Value != cv.ValueNoVar {
cv.Warnf("Python dependencies should not contain variables.")
- } else if !matches(cv.ValueNoVar, `^[+\-.0-9A-Z_a-z]+(?:|:link|:build)$`) {
+ } else if !matches(cv.ValueNoVar, `^[+\-.0-9A-Z_a-z]+(?:|:link|:build|:test|:tool)$`) {
cv.Warnf("Invalid Python dependency %q.", cv.Value)
cv.Explain(
"Python dependencies must be an identifier for a package, as",
"specified in lang/python/versioned_dependencies.mk.",
- "This identifier may be followed by :build for a build-time only",
- "dependency, or by :link for a run-time only dependency.")
+ "This identifier may be followed by:",
+ "\t:tool for a tool dependency,",
+ "\t:build for a build-time only dependency,",
+ "\t:test for a test-only dependency,",
+ "\t:link for a run-time dependency.")
}
}