[pacman-dev] [PATCH 1/2] makepkg: merge arch dependent variables after PKGBUILD linting

[Allan McRae]

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 scripts/makepkg.sh.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 22679f7..42bc228 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -761,10 +761,6 @@ merge_arch_attrs() {
 
 source_buildfile() {
 	source_safe "$@"
-
-	if (( !SOURCEONLY )); then
-		merge_arch_attrs
-	fi
 }
 
 run_function_safe() {
@@ -2004,6 +2000,13 @@ else
 	source_buildfile "$BUILDFILE"
 fi
 
+# check the PKGBUILD for some basic requirements
+lint_pkgbuild || exit 1
+
+if (( !SOURCEONLY )); then
+	merge_arch_attrs
+fi
+
 # set defaults if they weren't specified in buildfile
 pkgbase=${pkgbase:-${pkgname[0]}}
 basever=$(get_full_version)
@@ -2033,9 +2036,6 @@ if have_function pkgver; then
 	PKGVERFUNC=1
 fi
 
-# check the PKGBUILD for some basic requirements
-lint_pkgbuild || exit 1
-
 # check we have the software required to process the PKGBUILD
 check_software || exit 1
 
-- 
2.6.2