bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: fix $pkgname element duplication

Browse source 
run_split_packaging did not preserve the $pkgname array correctly, and
would create duplicate entries in the list during restore.

After restoring the backup (a b c) would become (a b c b c).

This probably went unnoticed because during --install, pacman would
reconcile the duplicates.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Benjamin Yates 2015-10-27 16:22:57 -04:00 • committed by Allan McRae
parent 960b64553d
commit 1142a32c7f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/makepkg.sh.in
View file

@ -1672,7 +1672,7 @@ restore_package_variables() {
} }
run_split_packaging() { run_split_packaging() {
local pkgname_backup=${pkgname[@]} local pkgname_backup=("${pkgname[@]}")
for pkgname in ${pkgname_backup[@]}; do for pkgname in ${pkgname_backup[@]}; do
pkgdir="$pkgdirbase/$pkgname" pkgdir="$pkgdirbase/$pkgname"
mkdir "$pkgdir" mkdir "$pkgdir"
@ -1684,7 +1684,7 @@ run_split_packaging() {
create_debug_package create_debug_package
restore_package_variables restore_package_variables
done done
pkgname=${pkgname_backup[@]} pkgname=("${pkgname_backup[@]}")
} }
m4_include(library/parseopts.sh) m4_include(library/parseopts.sh)