[pacman-dev] [PATCH v4 3/4] libmakepkg: disallow using any as an architecture specific variable

morganamilo morganamilo at gmail.com
Tue Jan 15 22:36:50 UTC 2019


Signed-off-by: morganamilo <morganamilo at gmail.com>
---
 scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in
index b65c01f2..7420cdbc 100644
--- a/scripts/libmakepkg/lint_pkgbuild/variable.sh.in
+++ b/scripts/libmakepkg/lint_pkgbuild/variable.sh.in
@@ -56,7 +56,10 @@ lint_variable() {
 	done
 
 	for a in ${arch[@]}; do
-		[[ $a == "any" ]] && continue
+		if [[ $a == "any" ]]; then
+			error "$(gettext "Can not provide architecture specific variables for the '%s' architecture: %s_%s")" "any" "$i" "$a"
+			ret=1
+		fi
 
 		for i in ${arch_array[@]}; do
 			if declare -p "${i}_${a}" > /dev/null 2>&1; then
@@ -106,6 +109,11 @@ lint_variable() {
 
 			for i in ${array[@]}; do
 				if extract_function_variable "package_$pkg" "${i}_${a}" 1 out; then
+					if [[ $a == "any" ]]; then
+						error "$(gettext "Can not provide architecture specific variables for the '%s' architecture: %s_%s")" "any" "$i" "$a"
+						ret=1
+					fi
+
 					error "$(gettext "%s can not be architecture specific: $s_$s")" "$i"
 					ret=1
 				fi
-- 
2.20.1


More information about the pacman-dev mailing list