From 6d41b71587a48f90a555846477b2ff6a976d766d Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Mon, 7 May 2012 16:22:49 -0400 Subject: Bash-4.2 patch 25 --- subst.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'subst.c') diff --git a/subst.c b/subst.c index 9feaa9c..c9a0678 100644 --- a/subst.c +++ b/subst.c @@ -366,6 +366,11 @@ dump_word_flags (flags) f &= ~W_ASSNBLTIN; fprintf (stderr, "W_ASSNBLTIN%s", f ? "|" : ""); } + if (f & W_ASSNGLOBAL) + { + f &= ~W_ASSNGLOBAL; + fprintf (stderr, "W_ASSNGLOBAL%s", f ? "|" : ""); + } if (f & W_COMPASSIGN) { f &= ~W_COMPASSIGN; @@ -2803,7 +2808,7 @@ do_assignment_internal (word, expand) } else if (assign_list) { - if (word->flags & W_ASSIGNARG) + if ((word->flags & W_ASSIGNARG) && (word->flags & W_ASSNGLOBAL) == 0) aflags |= ASS_MKLOCAL; if (word->flags & W_ASSIGNASSOC) aflags |= ASS_MKASSOC; -- cgit v1.2.3