summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2009-10-05 20:02:55 (GMT)
committerandreas_kupries <akupries@shaw.ca>2009-10-05 20:02:55 (GMT)
commit2e39402782031ee79d14b572fae56c5d7f5d73a0 (patch)
tree09fa355fac90c065fe61f21f038aec0da44c01b8
parent17c811e76499761b3348f848a50bb3946b821ae9 (diff)
downloadtcl-2e39402782031ee79d14b572fae56c5d7f5d73a0.zip
tcl-2e39402782031ee79d14b572fae56c5d7f5d73a0.tar.gz
tcl-2e39402782031ee79d14b572fae56c5d7f5d73a0.tar.bz2
* library/safe.tcl (AliasGlob): Fixed conversion of catch to
try/finally, it had an 'on ok msg' branch missing, causing a silent error immediately, and bogus glob results, breaking search for Tcl modules.
-rw-r--r--ChangeLog7
-rw-r--r--library/safe.tcl4
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3da653d..76df6b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-05 Andreas Kupries <andreask@activestate.com>
+
+ * library/safe.tcl (AliasGlob): Fixed conversion of catch to
+ try/finally, it had an 'on ok msg' branch missing, causing a
+ silent error immediately, and bogus glob results, breaking
+ search for Tcl modules.
+
2009-10-04 Daniel Steffen <das@users.sourceforge.net>
* macosx/tclMacOSXBundle.c: Workaround CF memory managment bug in
diff --git a/library/safe.tcl b/library/safe.tcl
index 5a3d4d0..ba1c4f5 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -12,7 +12,7 @@
# See the file "license.terms" for information on usage and redistribution of
# this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: safe.tcl,v 1.18 2009/07/26 11:40:24 dkf Exp $
+# RCS: @(#) $Id: safe.tcl,v 1.19 2009/10/05 20:02:55 andreas_kupries Exp $
#
# The implementation is based on namespaces. These naming conventions are
@@ -792,6 +792,8 @@ proc ::safe::setLogCmd {args} {
try {
::interp invokehidden $slave glob {*}$cmd
+ } on ok msg {
+ # Nothing to be done, just capture the 'msg' for later.
} on error msg {
Log $slave $msg
return -code error "script error"