aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2014-05-16 14:18:57 -0400
committerChet Ramey <chet.ramey@case.edu>2014-05-16 14:18:57 -0400
commit9ddcfa16842544a50150d075a279975db3776380 (patch)
tree23129ebeaf0aae180346fcbcbfac1923ceddf068
parent34ce402d021cb2c1a3647c1c69f2cde3cc4c0d0b (diff)
downloadandroid_external_bash-9ddcfa16842544a50150d075a279975db3776380.tar.gz
android_external_bash-9ddcfa16842544a50150d075a279975db3776380.tar.bz2
android_external_bash-9ddcfa16842544a50150d075a279975db3776380.zip
Bash-4.3 patch 17
-rw-r--r--patchlevel.h2
-rw-r--r--variables.c5
2 files changed, 2 insertions, 5 deletions
diff --git a/patchlevel.h b/patchlevel.h
index 706588e..2ff299b 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 16
+#define PATCHLEVEL 17
#endif /* _PATCHLEVEL_H_ */
diff --git a/variables.c b/variables.c
index 70fac3b..cdc54bc 100644
--- a/variables.c
+++ b/variables.c
@@ -2197,10 +2197,7 @@ make_local_variable (name)
/* local foo; local foo; is a no-op. */
old_var = find_variable (name);
if (old_var && local_p (old_var) && old_var->context == variable_context)
- {
- VUNSETATTR (old_var, att_invisible); /* XXX */
- return (old_var);
- }
+ return (old_var);
was_tmpvar = old_var && tempvar_p (old_var);
/* If we're making a local variable in a shell function, the temporary env