bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libmakepkg: disallow using 'any' with other arches

Browse source 
Error if the arch array contains any and any other values. This also
fixes a bug where the check for `$arch == 'any'` which only evaluated
the first value in the array, meaning the rest of the values would not
be linted.

Signed-off-by: morganamilo <morganamilo@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
morganamilo 2019-01-15 22:41:34 +00:00 • committed by Allan McRae
parent a5090217f9
commit c15f7ae606
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/libmakepkg/lint_pkgbuild/arch.sh.in
View file

@ -33,8 +33,13 @@ lint_pkgbuild_functions+=('lint_arch')
lint_arch() { lint_arch() {
local a name list ret=0 local a name list ret=0
if [[ $arch == 'any' ]]; then if in_array "any" "${arch[@]}"; then
return 0 if (( ${#arch[@]} == 1 )); then
return 0;
else
error "$(gettext "Can not use '%s' architecture with other architectures")" "any"
return 1;
fi
fi fi
for a in "${arch[@]}"; do for a in "${arch[@]}"; do