moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

Fix .SRCINFO output with architecture specific fields

Browse Source 
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:
Allan McRae 2014-12-27 23:20:36 +10:00
parent 5221440b6b
commit acc639adf2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/makepkg.sh.in
View File

@ -1621,7 +1621,10 @@ merge_arch_attrs() {
source_buildfile() { source_buildfile() {
source_safe "$@" source_safe "$@"
merge_arch_attrs
if (( !SOURCEONLY )); then
merge_arch_attrs
fi
} }
run_function_safe() { run_function_safe() {
@ -2136,8 +2139,6 @@ write_pkginfo() {
local size="$(@DUPATH@ @DUFLAGS@)" local size="$(@DUPATH@ @DUFLAGS@)"
size="$(( ${size%%[^0-9]*} * 1024 ))" size="$(( ${size%%[^0-9]*} * 1024 ))"
merge_arch_attrs
msg2 "$(gettext "Generating %s file...")" ".PKGINFO" msg2 "$(gettext "Generating %s file...")" ".PKGINFO"
printf "# Generated by makepkg %s\n" "$makepkg_version" printf "# Generated by makepkg %s\n" "$makepkg_version"
printf "# using %s\n" "$(fakeroot -v)" printf "# using %s\n" "$(fakeroot -v)"