From: Guido van Rossum <guido@python.org>
Date: Sat, 21 Jan 1995 14:09:37 +0000 (+0000)
Subject: don't overwrite error already set (e.g. from O&)
X-Git-Tag: v1.2b3~126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64fc64909524bc2a2dc351228dfdf1c2958ed7d1;p=thirdparty%2FPython%2Fcpython.git

don't overwrite error already set (e.g. from O&)
---

diff --git a/Python/getargs.c b/Python/getargs.c
index 68bfd0e53190..cd3ff6d4d8c1 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -259,6 +259,8 @@ seterror(iarg, msg, levels, fname, message)
 	int i;
 	char *p = buf;
 
+	if (err_occurred())
+		return;
 	if (iarg == 0 && message == NULL)
 		message = msg;
 	else if (message == NULL) {
@@ -583,7 +585,7 @@ convertsimple1(arg, p_format, p_va)
 				void *addr = va_arg(*p_va, void *);
 				format++;
 				if (! (*convert)(arg, addr))
-					return "";
+					return "(unspecified)";
 			}
 			else {
 				p = va_arg(*p_va, object **);