moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
Code Issues Releases Wiki Activity

makepkg: reorder args to pkgbuild_get_attribute for consistency

Browse Source 
In all other cases, this code gets the outvalue from the final
parameter.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Dave Reisner 2014-10-13 09:08:29 -04:00 committed by Allan McRae
parent 627ede8779
commit a0cfed7df2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/makepkg.sh.in
View File

@ -908,7 +908,7 @@ get_pkg_arch() {
fi fi
else else
local arch_override local arch_override
pkgbuild_get_attribute "$1" arch arch_override 0 pkgbuild_get_attribute "$1" arch 0 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"
@ -2418,10 +2418,10 @@ extract_function_var() {
pkgbuild_get_attribute() { pkgbuild_get_attribute() {
# $1: package name # $1: package name
# $2: attribute name # $2: attribute name
# $3: name of output var # $3: multivalued
# $4: multivalued # $4: name of output var
local pkgname=$1 attrname=$2 outputvar=$3 isarray=$4 local pkgname=$1 attrname=$2 isarray=$3 outputvar=$4
printf -v "$outputvar" %s '' printf -v "$outputvar" %s ''
@ -2518,7 +2518,7 @@ lint_arch() {
fi fi
for name in "${pkgname[@]}"; do for name in "${pkgname[@]}"; do
pkgbuild_get_attribute "$name" 'arch' list 1 pkgbuild_get_attribute "$name" 'arch' 1 list
if [[ $list && $list != 'any' ]] && ! in_array $CARCH "${list[@]}"; then if [[ $list && $list != 'any' ]] && ! in_array $CARCH "${list[@]}"; then
if (( ! IGNOREARCH )); then if (( ! IGNOREARCH )); then
error "$(gettext "%s is not available for the '%s' architecture.")" "$name" "$CARCH" error "$(gettext "%s is not available for the '%s' architecture.")" "$name" "$CARCH"