summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-11-10 18:21:19 -0600
committerDan McGee <dan@archlinux.org>2009-11-10 18:21:19 -0600
commit7ae15768e5558def8bdf88fe6c5c49fa6c9b08ad (patch)
tree34ff2c542ed9b7d4519644ece5c1452e226b7f3e /scripts
parent3f7cc83e0df79f24c545924d7b38e9fa22302b2a (diff)
parente09253d15b879f3375d57efd656e687a984ebc36 (diff)
downloadpacman-7ae15768e5558def8bdf88fe6c5c49fa6c9b08ad.tar.xz
Merge branch 'maint'
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in9
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 92b04546..25fb8d93 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1315,7 +1315,7 @@ devel_update() {
backup_package_variables() {
for var in ${splitpkg_overrides[@]}; do
indirect="${var}_backup"
- eval "${indirect}=(\${$var[@]})"
+ eval "${indirect}=(\"\${$var[@]}\")"
done
}
@@ -1323,16 +1323,11 @@ 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
done
-
- # pkgdesc gets restored as an array - convert back to a string
- local pkgdesc_backup="${pkgdesc[@]}"
- unset pkgdesc
- pkgdesc=${pkgdesc_backup}
}
# getopt like parser