[pacman-dev] [PATCH v2] makepkg: Only backup package variables once

Allan McRae allan at archlinux.org
Fri Jan 4 03:01:32 UTC 2019


From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>

We don't need to re-backup the variables we restored on the previous
iteration.

Signed-off-by: Allan McRae <allan at archlinux.org>
---

Rebase of https://patchwork.archlinux.org/patch/638/ .  Posting here as a FYI.

 scripts/makepkg.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 4449ccf7..33b3a70e 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -924,10 +924,10 @@ restore_package_variables() {
 
 run_split_packaging() {
 	local pkgname_backup=("${pkgname[@]}")
+	backup_package_variables
 	for pkgname in ${pkgname_backup[@]}; do
 		pkgdir="$pkgdirbase/$pkgname"
 		mkdir "$pkgdir"
-		backup_package_variables
 		run_package $pkgname
 		tidy_install
 		lint_package || exit $E_PACKAGE_FAILED
-- 
2.20.0


More information about the pacman-dev mailing list