summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authordkf <dkf@noemail.net>2009-07-26 21:48:44 (GMT)
committerdkf <dkf@noemail.net>2009-07-26 21:48:44 (GMT)
commite526cb63a3c5486609789846d315868599e4c677 (patch)
treeb93fc940bd702cc9f9ca598f77390dfa696ce15f /library
parent980f67dc09937450bbbbc6dc2650a7468f7afb7d (diff)
downloadtcl-e526cb63a3c5486609789846d315868599e4c677.zip
tcl-e526cb63a3c5486609789846d315868599e4c677.tar.gz
tcl-e526cb63a3c5486609789846d315868599e4c677.tar.bz2
Simplify a bit further following more testing
FossilOrigin-Name: f1b2eb098293e62eee141ddc77e6eccd37e6c4a7
Diffstat (limited to 'library')
-rw-r--r--library/auto.tcl13
1 files changed, 3 insertions, 10 deletions
diff --git a/library/auto.tcl b/library/auto.tcl
index 7d4c340..42ffa72 100644
--- a/library/auto.tcl
+++ b/library/auto.tcl
@@ -3,7 +3,7 @@
# utility procs formerly in init.tcl dealing with auto execution of commands
# and can be auto loaded themselves.
#
-# RCS: @(#) $Id: auto.tcl,v 1.29 2009/07/26 11:40:23 dkf Exp $
+# RCS: @(#) $Id: auto.tcl,v 1.30 2009/07/26 21:48:45 dkf Exp $
#
# Copyright (c) 1991-1993 The Regents of the University of California.
# Copyright (c) 1994-1998 Sun Microsystems, Inc.
@@ -63,7 +63,6 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
if {[info exists the_library] && $the_library ne ""} {
lappend dirs $the_library
} else {
-
# Do the canonical search
# 1. From an environment variable, if it exists. Placing this first
@@ -77,14 +76,8 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
# 2. In the package script directory registered within the
# configuration of the package itself.
- try {
- ::${basename}::pkgconfig get scriptdir,runtime
- } on ok value {
- lappend dirs $value
- } on error {msg opts} {
- if {![string match "invalid command name *" $msg]} {
- return -options $opts $msg
- }
+ catch {
+ lappend dirs [::${basename}::pkgconfig get scriptdir,runtime]
}
# 3. Relative to auto_path directories. This checks relative to the