[pacman-dev] [PATCH] makepkg: quote arrays in order to preserve spaces in array items

Allan McRae allan at archlinux.org
Thu Nov 5 17:50:32 EST 2009


Cedric Staniewski wrote:
> Fixes FS#16871.
> 
> Signed-off-by: Cedric Staniewski <cedric at gmx.ca>
> ---
>  scripts/makepkg.sh.in |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 92b0454..8ca89e1 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -1315,7 +1315,7 @@ devel_update() {
>  backup_package_variables() {
>  	for var in ${splitpkg_overrides[@]}; do
>  		indirect="${var}_backup"
> -		eval "${indirect}=(\${$var[@]})"
> +		eval "${indirect}=(\"\${$var[@]}\")"
>  	done
>  }
>  
> @@ -1323,7 +1323,7 @@ restore_package_variables() {
>  	for var in ${splitpkg_overrides[@]}; do
>  		indirect="${var}_backup"
>  		if [ -n "${!indirect}" ]; then
> -			eval "${var}=(\${$indirect[@]})"
> +			eval "${var}=(\"\${$indirect[@]}\")"
>  		else
>  			unset ${var}
>  		fi

Looks good.  This will also fix the pkgdesc issues that are worked 
around at the end of the restore_package_variables function so you can 
delete those few lines too.

Allan


More information about the pacman-dev mailing list