moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-11 03:54:59 -05:00
Code Issues Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Allan McRae 2014-12-28 13:06:04 +10:00
commit 2759858e8c
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

@ -1622,7 +1622,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() {
@ -2137,8 +2140,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)"