diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2015-01-09 20:57:37 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-01-11 09:57:06 +0100 |
| commit | fb9db2df5d1188b87f5763e4681f7f6d1b7ff988 (patch) | |
| tree | 89c2530ba4ca29e2bc07044108b1c92d1f9cb00b /scripts/makepkg.sh.in | |
| parent | 83d5512bf1f8b1321e239cb8efdcb3547213d011 (diff) | |
| download | pacman-fb9db2df5d1188b87f5763e4681f7f6d1b7ff988.tar.gz pacman-fb9db2df5d1188b87f5763e4681f7f6d1b7ff988.tar.xz | |
makepkg: restore attr merging for write_pkginfo
acc639adf20d removed this, but shouldn't have.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts/makepkg.sh.in')
| -rw-r--r-- | scripts/makepkg.sh.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ace44e23..22e02535 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2139,6 +2139,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)" |