[pacman-dev] [PATCH 3/3] makepkg: restore attr merging for write_pkginfo

Dave Reisner dreisner at archlinux.org
Fri Jan 9 20:52:25 UTC 2015


acc639adf20d removed this, but shouldn't have.
---
Allan, any idea why you removed this? I infer from the commit message that
the patch was about SRCINFO only, and had nothing to do with PKGINFO.

 scripts/makepkg.sh.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e032e26..7093dcd 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2140,6 +2140,8 @@ 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)"
-- 
2.2.1


More information about the pacman-dev mailing list