summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2009-07-03 18:28:03 +0200
committerAllan McRae <allan@archlinux.org>2009-07-10 08:29:58 +0200
commite72cce352a4f43e371998dc8985b5fa2e0102216 (patch)
tree1eb06ca57ff7ef07ec8fdca6fcc68512a32dc39e /scripts
parent621aa26e26fcf578221051e896d6440a0095b8a3 (diff)
downloadpacman-e72cce352a4f43e371998dc8985b5fa2e0102216.tar.gz
pacman-e72cce352a4f43e371998dc8985b5fa2e0102216.tar.xz
makepkg: fix pkgdesc restoration with split packaging
A pkgdesc with spaces in it would get restored to an array and thus only the first word would be restored (FS#15210). Convert that array back to a string. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e9bd57cf..8aa6cfcc 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1281,6 +1281,11 @@ restore_package_variables() {
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