mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-22 15:58:50 -05:00
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>
This commit is contained in:
parent
5221440b6b
commit
acc639adf2
@ -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)"
|
||||
|
Loading…
Reference in New Issue
Block a user