summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2014-12-28 13:06:04 +1000
committerAllan McRae <allan@archlinux.org>2014-12-28 13:06:04 +1000
commit2759858e8c784dbce6fd60bf032efe96b40a9032 (patch)
treea86c9e2f69268c1e50172567046287cd56155e4c
parent6356567ae0fb9927c80811642e7d949270fd5784 (diff)
parentacc639adf20da077ed6f0141289d953997be92f8 (diff)
downloadpacman-2759858e8c784dbce6fd60bf032efe96b40a9032.tar.xz
Merge branch 'maint'
-rw-r--r--scripts/makepkg.sh.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 440848f4..0db99120 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1622,7 +1622,10 @@ merge_arch_attrs() {
source_buildfile() {
source_safe "$@"
- merge_arch_attrs
+
+ if (( !SOURCEONLY )); then
+ merge_arch_attrs
+ fi
}
run_function_safe() {
@@ -2137,8 +2140,6 @@ 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)"