[pacman-dev] [PATCH 4/6] makepkg: Only backup package variables once

Jan Alexander Steffens (heftig) jan.steffens at gmail.com
Tue Jun 19 20:33:59 UTC 2018


We don't need to re-backup the variables we restored on the previous
iteration.
---
 scripts/makepkg.sh.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 331249ea..bf228202 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1124,11 +1124,10 @@ backup_package_variables() {
 
 run_split_packaging() {
 	local pkgname_backup=("${pkgname[@]}")
-	local restore_package_variables
+	local restore_package_variables="$(backup_package_variables)"
 	for pkgname in ${pkgname_backup[@]}; do
 		pkgdir="$pkgdirbase/$pkgname"
 		mkdir "$pkgdir"
-		restore_package_variables="$(backup_package_variables)"
 		run_package $pkgname
 		tidy_install
 		lint_package || exit $E_PACKAGE_FAILED
-- 
2.17.1


More information about the pacman-dev mailing list