Commit b543c055 authored by Ivy Foster's avatar Ivy Foster Committed by Allan McRae
Browse files

Make get_pkg_arch treat arch as an array



We use the get_pkg_arch function with the package name parameter in two places:
1) checking if the package is already built
2) installing build packages

Currently this failed when a package override for "arch" was an array, despite
all our documentation stating that it is indeed an array.  This change makes
these two places fail if there is package override for arch that is not an
array - i.e. of the form arch='i686'.
Signed-off-by: default avatarIvy Foster <joyfulgirl@archlinux.us>
Signed-off-by: Allan McRae's avatarAllan McRae <allan@archlinux.org>
parent b8f2d713
......@@ -902,7 +902,7 @@ get_pkg_arch() {
fi
else
local arch_override
pkgbuild_get_attribute "$1" arch 0 arch_override
pkgbuild_get_attribute "$1" arch 1 arch_override
(( ${#arch_override[@]} == 0 )) && arch_override=("${arch[@]}")
if [[ $arch_override = "any" ]]; then
printf "%s\n" "any"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment