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.
This commit is contained in:
rillig 2020-05-18 19:11:16 +00:00
parent 6d2a176c75
commit 9c42f8b711
2 changed files with 8 additions and 5 deletions

View file

@ -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 CATEGORIES= pkgtools
DISTNAME= tools DISTNAME= tools
MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/} MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/}

View file

@ -1143,13 +1143,16 @@ func (cv *VartypeCheck) PrefixPathname() {
func (cv *VartypeCheck) PythonDependency() { func (cv *VartypeCheck) PythonDependency() {
if cv.Value != cv.ValueNoVar { if cv.Value != cv.ValueNoVar {
cv.Warnf("Python dependencies should not contain variables.") 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.Warnf("Invalid Python dependency %q.", cv.Value)
cv.Explain( cv.Explain(
"Python dependencies must be an identifier for a package, as", "Python dependencies must be an identifier for a package, as",
"specified in lang/python/versioned_dependencies.mk.", "specified in lang/python/versioned_dependencies.mk.",
"This identifier may be followed by :build for a build-time only", "This identifier may be followed by:",
"dependency, or by :link for a run-time only dependency.") "\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.")
} }
} }