[pacman-dev] [PATCH] makepkg: move update_pkgver out of extract_sources

Allan McRae allan at archlinux.org
Fri Nov 1 07:53:06 EDT 2013


The extract_sources function should be just extracting sources.

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

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 401d681..446e1de 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1359,11 +1359,6 @@ extract_sources() {
 				;;
 		esac
 	done
-
-	if (( PKGVERFUNC )); then
-		update_pkgver
-		check_build_status
-	fi
 }
 
 error_function() {
@@ -3004,6 +2999,10 @@ elif (( !REPKG )); then
 	fi
 
 	extract_sources
+	if (( PKGVERFUNC )); then
+		update_pkgver
+		check_build_status
+	fi
 	if (( PREPAREFUNC )); then
 		run_prepare
 	fi
-- 
1.8.4.2



More information about the pacman-dev mailing list