summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2021-11-13 21:20:59 +0000
committerrillig <rillig@pkgsrc.org>2021-11-13 21:20:59 +0000
commitece8a99ab65d64e7a8718ea4cba1354b530da751 (patch)
tree6ea7e739a35f337ed92f4b2ab6cfbbc2e3e793fc
parent9eeb7b377edd35b9e3b72f175638ec0c9da91fd2 (diff)
downloadpkgsrc-ece8a99ab65d64e7a8718ea4cba1354b530da751.tar.gz
pkgtools/pkglint: update to 21.3.3
Changes since 21.3.2: Explain warning about invalid symlink. Do not warn when a package uses MAKE_JOBS without adding it to BUILD_DEFS, since MAKE_JOBS is supposed to be a build-time only variable.
-rw-r--r--pkgtools/pkglint/Makefile5
-rw-r--r--pkgtools/pkglint/files/line.go2
-rw-r--r--pkgtools/pkglint/files/package.go6
-rw-r--r--pkgtools/pkglint/files/pkgsrc.go1
4 files changed, 9 insertions, 5 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 1831274d506..8a44204bdc5 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.702 2021/11/05 20:02:47 bsiegert Exp $
+# $NetBSD: Makefile,v 1.703 2021/11/13 21:20:59 rillig Exp $
-PKGNAME= pkglint-21.3.2
-PKGREVISION= 1
+PKGNAME= pkglint-21.3.3
CATEGORIES= pkgtools
DISTNAME= tools
MASTER_SITES= ${MASTER_SITE_GITHUB:=golang/}
diff --git a/pkgtools/pkglint/files/line.go b/pkgtools/pkglint/files/line.go
index 1e0c9fabee8..b5decabf468 100644
--- a/pkgtools/pkglint/files/line.go
+++ b/pkgtools/pkglint/files/line.go
@@ -167,7 +167,7 @@ func (line *Line) Notef(format string, args ...interface{}) {
G.Logger.Diag(line, Note, format, args...)
}
-func (line *Line) Explain(explanation ...string) { G.Logger.Explain(explanation...) }
+func (*Line) Explain(explanation ...string) { G.Logger.Explain(explanation...) }
func (line *Line) String() string {
return sprintf("%s:%s: %s", line.Filename(), line.Linenos(), line.Text)
diff --git a/pkgtools/pkglint/files/package.go b/pkgtools/pkglint/files/package.go
index 709921b506b..4d309d5c69b 100644
--- a/pkgtools/pkglint/files/package.go
+++ b/pkgtools/pkglint/files/package.go
@@ -1494,7 +1494,11 @@ func (pkg *Package) checkDirent(dirent CurrPath, mode os.FileMode) {
}
case mode&os.ModeSymlink != 0:
- NewLineWhole(dirent).Warnf("Invalid symlink name.")
+ line := NewLineWhole(dirent)
+ line.Warnf("Invalid symlink name.")
+ line.Explain(
+ "The only symlinks that pkglint ever expects are those to",
+ "WRKDIR, which are usually named 'work' or 'work.*'.")
default:
NewLineWhole(dirent).Errorf("Only files and directories are allowed in pkgsrc.")
diff --git a/pkgtools/pkglint/files/pkgsrc.go b/pkgtools/pkglint/files/pkgsrc.go
index ff11a717b12..2361dadcf39 100644
--- a/pkgtools/pkglint/files/pkgsrc.go
+++ b/pkgtools/pkglint/files/pkgsrc.go
@@ -881,6 +881,7 @@ func (src *Pkgsrc) loadDefaultBuildDefs() {
"FETCH_CMD",
"FETCH_OUTPUT_ARGS",
"FETCH_USING",
+ "MAKE_JOBS",
"PKGSRC_RUN_TEST")
// The following variables are used so often that not every