Attachment "None" to
ticket [403528ffff]
added by
dgp
2001-02-01 01:29:31.
Index: generic/tclInitScript.h
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclInitScript.h,v
retrieving revision 1.12
diff -u -r1.12 tclInitScript.h
--- generic/tclInitScript.h 1999/08/19 02:59:10 1.12
+++ generic/tclInitScript.h 2001/01/31 18:22:13
@@ -58,7 +58,11 @@
set tclfile [file join $i init.tcl]\n\
if {[file exists $tclfile]} {\n\
if {![catch {uplevel #0 [list source $tclfile]} msg]} {\n\
- return\n\
+ if {[string length $errors]} {\n\
+ error \"Failed 'init.tcl' evaluation(s):\n\n$errors\"\n\
+ } else {\n\
+ return\n\
+ }\n\
} else {\n\
append errors \"$tclfile: $msg\n$errorInfo\n\"\n\
}\n\
Index: library/auto.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/auto.tcl,v
retrieving revision 1.7
diff -u -r1.7 auto.tcl
--- library/auto.tcl 2000/02/08 10:06:12 1.7
+++ library/auto.tcl 2001/01/31 18:22:13
@@ -106,7 +106,11 @@
if {[interp issafe] || [file exists $file]} {
if {![catch {uplevel #0 [list source $file]} msg]} {
- return
+ if {[string length $errors]} {
+ error "Failed '$initScript' evaluation(s):\n\n$errors"
+ } else {
+ return
+ }
} else {
append errors "$file: $msg\n$errorInfo\n"
}