From acc639adf20da077ed6f0141289d953997be92f8 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 27 Dec 2014 23:20:36 +1000 Subject: Fix .SRCINFO output with architecture specific fields Do not merge the architecture specific fields when creating a .SRCINFO file. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ab4a784b..18b2822c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1621,7 +1621,10 @@ merge_arch_attrs() { source_buildfile() { source_safe "$@" - merge_arch_attrs + + if (( !SOURCEONLY )); then + merge_arch_attrs + fi } run_function_safe() { @@ -2136,8 +2139,6 @@ 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)" -- cgit v1.2.3-70-g09d2