summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2018-09-04 21:17:54 +0200
committerAllan McRae <allan@archlinux.org>2018-09-19 02:54:26 +0200
commit2bec380e108536f5e5f728ef66223ed3fabf5ab1 (patch)
tree4751a3eca8546aa580ea2ccf1fb0f84484c07cb6
parent3318039e3b1530396b0e3ced49ea6fe5b6ea00c5 (diff)
downloadpacman-2bec380e108536f5e5f728ef66223ed3fabf5ab1.tar.gz
pacman-2bec380e108536f5e5f728ef66223ed3fabf5ab1.tar.xz
libmakepkg/lint_config: fix lint_variable actually running the PKGBUILD lint
Due to a copy-paste error when initially implementing this, it actually uses a duplicate function name, usually resulting in lint_pkgbuild overwriting the function definition. Then the PKGBUILD lint gets run twice, one time before the PKGBUILD is even sourced -- to potentially surprising results, like erroring out on a pre-existing shell definition that doesn't match our expectations. Seen in the wild with lint_config triggering an error for 'declare -x arch="foo"' Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/libmakepkg/lint_config/variable.sh.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/libmakepkg/lint_config/variable.sh.in b/scripts/libmakepkg/lint_config/variable.sh.in
index 14bd0e05..55ed6d6d 100644
--- a/scripts/libmakepkg/lint_config/variable.sh.in
+++ b/scripts/libmakepkg/lint_config/variable.sh.in
@@ -25,10 +25,10 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
source "$LIBRARY/util/message.sh"
-lint_config_functions+=('lint_variable')
+lint_config_functions+=('lint_config_variables')
-lint_variable() {
+lint_config_variables() {
local array=(DLAGENTS VCSCLIENTS BUILDENV OPTIONS INTEGRITY_CHECK MAN_DIRS
DOC_DIRS PURGE_TARGETS COMPRESSGZ COMPRESSBZ2 COMPRESSXZ
COMPRESSLRZ COMPRESSLZO COMPRESSZ)