about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/builtin.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 28b5174c4..9963a0da8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-10  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* users/17754: Src/builtin.c: failing to retie an array
+	and colon-separated scalar shouldn't be a fatal error.
+
 2013-04-09  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 31246: Makefile.in, Src/zsh.mdd: make a separate patch level
diff --git a/Src/builtin.c b/Src/builtin.c
index d91c2d944..cd886437b 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -2470,7 +2470,7 @@ bin_typeset(char *name, char **argv, Options ops, int func)
 			setsparam(asg0.name, ztrdup(asg0.value));
 		    return 0;
 		} else {
-		    zerrnam(name, "can't tie already tied scalar: %s",
+		    zwarnnam(name, "can't tie already tied scalar: %s",
 			    asg0.name);
 		}
 		return 1;