diff options
| author | Allan McRae <allan@archlinux.org> | 2014-12-27 23:20:36 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-12-28 13:05:41 +1000 |
| commit | acc639adf20da077ed6f0141289d953997be92f8 (patch) | |
| tree | 1b559f23e935916dc6bea38ba4509a44f6e60ddf /scripts | |
| parent | 5221440b6bd0520762026a24abdde50d60552f99 (diff) | |
| download | pacman-acc639adf20da077ed6f0141289d953997be92f8.tar.xz | |
Fix .SRCINFO output with architecture specific fields
Do not merge the architecture specific fields when creating a .SRCINFO file.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 7 |
1 files 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)" |