From b543c055b9607161e6bd47b9d3709243057c8771 Mon Sep 17 00:00:00 2001 From: Ivy Foster Date: Fri, 20 Mar 2015 19:19:56 -0500 Subject: [PATCH] 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: Ivy Foster Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 24289071..227563ce 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -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"