moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-10-31 23:55:04 -04:00
Code Issues Releases Wiki Activity

Make get_pkg_arch treat arch as an array

Browse Source 
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>
This commit is contained in:
Ivy Foster 2015-03-20 19:19:56 -05:00 committed by Allan McRae
parent b8f2d713e0
commit b543c055b9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/makepkg.sh.in
View File

@ -902,7 +902,7 @@ get_pkg_arch() {
fi fi
else else
local arch_override 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[@]}") (( ${#arch_override[@]} == 0 )) && arch_override=("${arch[@]}")
if [[ $arch_override = "any" ]]; then if [[ $arch_override = "any" ]]; then
printf "%s\n" "any" printf "%s\n" "any"