X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fstartup.tcl;h=4ca2cabc26b91df3491aeba99871e597e4f113b6;hp=926d26b637fb3072ca6481c278a106f12fb3fef7;hb=19f219f731f29503c8e4d432935d3ea558cc1659;hpb=33bb0fe6194b697bfc7e89338c0ffac1c54d09be

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index 926d26b637..4ca2cabc26 100644
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -16,10 +16,12 @@ proc exit {} {
 proc ocd_bouncer {name args} {
 	set cmd [format "ocd_%s" $name]
 	set type [eval ocd_command type $cmd $args]
+	set errcode error
 	if {$type == "native"} {
 		return [eval $cmd $args]
 	} else {if {$type == "simple"} {
-		if {[catch {eval $cmd $args}] == 0} {
+		set errcode [catch {eval $cmd $args}]
+		if {$errcode == 0} {
 			return ""
 		} else {
 			# 'classic' commands output error message as part of progress output
@@ -32,7 +34,7 @@ proc ocd_bouncer {name args} {
 	} else {
 		set errmsg [format "invalid subcommand \"%s\"" $args]
 	}}}
-	return -code error $errmsg
+	return -code $errcode $errmsg
 }
 
 # Try flipping / and \ to find file if the filename does not