CVS commit: pkgsrc/pkgtools/pkglint

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon May 18 19:11:16 UTC 2020

Modified Files:
        pkgsrc/pkgtools/pkglint: Makefile
        pkgsrc/pkgtools/pkglint/files: vartypecheck.go

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.645 -r1.646 pkgsrc/pkgtools/pkglint/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/pkgtools/pkglint/files/vartypecheck.go

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkglint/Makefile
diff -u pkgsrc/pkgtools/pkglint/Makefile:1.645 pkgsrc/pkgtools/pkglint/Makefile:1.646
--- pkgsrc/pkgtools/pkglint/Makefile:1.645      Sun May 17 07:07:18 2020
+++ pkgsrc/pkgtools/pkglint/Makefile    Mon May 18 19:11:16 2020
@@ -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/}

Index: pkgsrc/pkgtools/pkglint/files/vartypecheck.go
diff -u pkgsrc/pkgtools/pkglint/files/vartypecheck.go:1.86 pkgsrc/pkgtools/pkglint/files/vartypecheck.go:1.87
--- pkgsrc/pkgtools/pkglint/files/vartypecheck.go:1.86  Fri May  8 19:50:04 2020
+++ pkgsrc/pkgtools/pkglint/files/vartypecheck.go       Mon May 18 19:11:16 2020
@@ -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.")
        }
 }