bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: restore attr merging for write_pkginfo

Browse source 
acc639adf2 removed this, but shouldn't have.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Dave Reisner 2015-01-09 14:57:37 -05:00 • committed by Allan McRae
parent 83d5512bf1
commit fb9db2df5d
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/makepkg.sh.in
View file

@ -2139,6 +2139,8 @@ 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)"