[pacman-dev] [PATCH] Fix copying of arrays in makepkg.
Arrays were being converted to strings, then back to arrays rather than being copied directly as arrays. This closes FS#16871 Signed-off-by: Loui Chang <louipc.ist@gmail.com> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 92b0454..8ca89e1 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,7 +1323,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 -- 1.6.5.2
On Mon, Nov 9, 2009 at 9:34 PM, Loui Chang <louipc.ist@gmail.com> wrote:
Arrays were being converted to strings, then back to arrays rather than being copied directly as arrays.
This closes FS#16871
Signed-off-by: Loui Chang <louipc.ist@gmail.com> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Cedric beat you to it by a few days : http://mailman.archlinux.org/pipermail/pacman-dev/2009-November/010017.html Allan picked it in his working branch : http://projects.archlinux.org/users/allan/pacman.git/commit/?h=working&id=70d7a8ec55da2b958f3441f31e13e0f6e313b7aa But the bug report has not been updated. will do that now.
On Mon 09 Nov 2009 21:50 +0100, Xavier wrote:
On Mon, Nov 9, 2009 at 9:34 PM, Loui Chang <louipc.ist@gmail.com> wrote:
Arrays were being converted to strings, then back to arrays rather than being copied directly as arrays.
This closes FS#16871
Signed-off-by: Loui Chang <louipc.ist@gmail.com> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Cedric beat you to it by a few days : http://mailman.archlinux.org/pipermail/pacman-dev/2009-November/010017.html Allan picked it in his working branch : http://projects.archlinux.org/users/allan/pacman.git/commit/?h=working&id=70d7a8ec55da2b958f3441f31e13e0f6e313b7aa
But the bug report has not been updated. will do that now.
Ah. I guess I should pay more attention on this mailing list. Is there any document describing who's branches/repos I should check before submitting patches? That could be helpful. I've just been following the main repo.
On Mon, Nov 9, 2009 at 10:25 PM, Loui Chang <louipc.ist@gmail.com> wrote:
Ah. I guess I should pay more attention on this mailing list. Is there any document describing who's branches/repos I should check before submitting patches? That could be helpful. I've just been following the main repo.
I think it happened several times people writing patches on top of the stable release, for something that was fixed in git master. But for something not in git master but in someone branch, it is quite rare. That's because simple bugfixes are typically the first ones to be merged to master and that's done quickly. The situation right now for makepkg is a bit special though. The patches are frozen because we want to merge the big [[ (( test patch first. So Allan is accumulating patches in his working branch : http://projects.archlinux.org/users/allan/pacman.git/log/?h=working But just for your information, there are only 4 git tree : Allan : http://projects.archlinux.org/users/allan/pacman.git/ me : http://code.toofishes.net/cgit/xavier/pacman.git/ dan : http://code.toofishes.net/cgit/dan/pacman.git/ nagy : http://repo.or.cz/w/pacman-ng.git And dan merges stuff from these 4 tree to the primary one : http://projects.archlinux.org/pacman.git/
participants (2)
-
Loui Chang
-
Xavier