commit bash-20141128 snapshot

This commit is contained in:
Chet Ramey
2014-12-02 16:15:47 -05:00
parent 0a233f3ec4
commit 09f70f2f67
59 changed files with 54337 additions and 2021 deletions
+2 -2
View File
@@ -2634,7 +2634,7 @@ bind_variable_internal (name, value, table, hflags, aflags)
else
{
assign_value:
if (readonly_p (entry) || noassign_p (entry))
if ((readonly_p (entry) && (aflags & ASS_FORCE) == 0) || noassign_p (entry))
{
if (readonly_p (entry))
err_readonly (name);
@@ -3840,7 +3840,7 @@ push_temp_var (data)
binding_table = shell_variables->table = hash_create (TEMPENV_HASH_BUCKETS);
}
v = bind_variable_internal (var->name, value_cell (var), binding_table, 0, 0);
v = bind_variable_internal (var->name, value_cell (var), binding_table, 0, ASS_FORCE);
/* XXX - should we set the context here? It shouldn't matter because of how
assign_in_env works, but might want to check. */