summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvy Foster <joyfulgirl@archlinux.us>2015-03-21 01:19:56 +0100
committerAllan McRae <allan@archlinux.org>2015-03-26 05:42:22 +0100
commitb543c055b9607161e6bd47b9d3709243057c8771 (patch)
treed0f7dc7c0bde563ce66cedfe08843cc22d5fcd05
parentb8f2d713e00c453efab035f467d63508897f08ea (diff)
downloadpacman-origin/maint.tar.gz
pacman-origin/maint.tar.xz
Make get_pkg_arch treat arch as an arrayorigin/maint
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 <joyfulgirl@archlinux.us> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in2
1 files changed, 1 insertions, 1 deletions
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"