[pacman-dev] [PATCH 3/3] makepkg: restore attr merging for write_pkginfo

[Allan McRae]

On 10/01/15 06:52, Dave Reisner wrote:
> acc639adf20d removed this, but shouldn't have.
> ---
> Allan, any idea why you removed this? I infer from the commit message that
> the patch was about SRCINFO only, and had nothing to do with PKGINFO.
> 

It is done when the PKGBUILD is sourced:

source_buildfile() {
	source_safe "$@"

	if (( !SOURCEONLY )); then
		merge_arch_attrs
	fi
}


>  scripts/makepkg.sh.in | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index e032e26..7093dcd 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -2140,6 +2140,8 @@ write_pkginfo() {
>  	local size="$(@DUPATH@ @DUFLAGS@)"
>  	size="$(( ${size%%[^0-9]*} * 1024 ))"
>  
> +	merge_arch_attrs
> +
>  	msg2 "$(gettext "Generating %s file...")" ".PKGINFO"
>  	printf "# Generated by makepkg %s\n" "$makepkg_version"
>  	printf "# using %s\n" "$(fakeroot -v)"
>