From 30a978b7d808c067219c95be88c4979b6a7aa251 Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Mon, 20 Jun 2016 15:14:49 -0400 Subject: [PATCH] Bash-4.3 patch 46 --- patchlevel.h | 2 +- subst.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/patchlevel.h b/patchlevel.h index beea6887f..22bb68c0c 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -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_ */ diff --git a/subst.c b/subst.c index 961750c4f..3958237b0 100644 --- a/subst.c +++ b/subst.c @@ -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) -- 2.47.2