Bash-4.3 patch 46

This commit is contained in:
Chet Ramey 2016-06-20 15:14:49 -04:00
commit 30a978b7d8
2 changed files with 9 additions and 2 deletions

View file

@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 45
#define PATCHLEVEL 46
#endif /* _PATCHLEVEL_H_ */

View file

@ -9561,7 +9561,14 @@ shell_expand_word_list (tlist, eflags)
opts[opti] = '\0';
if (opti > 0)
make_internal_declare (tlist->word->word, opts);
{
t = make_internal_declare (tlist->word->word, opts);
if (t != EXECUTION_SUCCESS)
{
last_command_exit_value = t;
exp_jump_to_top_level (DISCARD);
}
}
t = do_word_assignment (tlist->word, 0);
if (t == 0)