summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2009-06-09 06:11:15 +0200
committerDan McGee <dan@archlinux.org>2009-06-13 16:51:18 +0200
commitef500b44ce45255da16e18b8e9aa4d43fab359b8 (patch)
treefc58b019d153ea569aa6ac2ef31cc2ac934c6ff7
parent04d5c4294ab5d35cceb149d7c94a4bf3aa6d7a85 (diff)
downloadpacman-ef500b44ce45255da16e18b8e9aa4d43fab359b8.tar.gz
pacman-ef500b44ce45255da16e18b8e9aa4d43fab359b8.tar.xz
makepkg: fix variable backup/restore for splitpkg
The backup and restore of variables that can be overridden while making split packages only dealt with the first element, not the whole array (FS#15010). Adjust the bash voodoo to fix it... Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e2e3de68..433fe348 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1262,7 +1262,7 @@ devel_update() {
backup_package_variables() {
for var in ${splitpkg_overrides[@]}; do
indirect="${var}_backup"
- eval "${indirect}=\"${!var}\""
+ eval "${indirect}=(\${$var[@]})"
done
}
@@ -1270,7 +1270,7 @@ restore_package_variables() {
for var in ${splitpkg_overrides[@]}; do
indirect="${var}_backup"
if [ -n "${!indirect}" ]; then
- eval "${var}=\"${!indirect}\""
+ eval "${var}=(\${$indirect[@]})"
else
unset ${var}
fi