diff options
| author | stanton <stanton> | 1998-11-11 04:08:12 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1998-11-11 04:08:12 (GMT) |
| commit | 131c68d85079ca5a553b28fef489cf29b79f1176 (patch) | |
| tree | 7e89676f31bb688b2686f508446e3282e7148a05 /library/auto.tcl | |
| parent | 0a41c61107c36da0a8e4ca0fc259149e3bc1956d (diff) | |
| download | tcl-131c68d85079ca5a553b28fef489cf29b79f1176.zip tcl-131c68d85079ca5a553b28fef489cf29b79f1176.tar.gz tcl-131c68d85079ca5a553b28fef489cf29b79f1176.tar.bz2 | |
merged 8.0.4 into 8.1
Diffstat (limited to 'library/auto.tcl')
| -rw-r--r-- | library/auto.tcl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/library/auto.tcl b/library/auto.tcl index 6e731fc..6f5e4e6 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.1.2.3 1998/10/05 18:46:03 stanton Exp $ +# RCS: @(#) $Id: auto.tcl,v 1.1.2.4 1998/11/11 04:08:24 stanton Exp $ # # Copyright (c) 1991-1993 The Regents of the University of California. # Copyright (c) 1994-1998 Sun Microsystems, Inc. @@ -25,7 +25,8 @@ proc auto_reset {} { global auto_execs auto_index auto_oldpath foreach p [info procs] { if {[info exists auto_index($p)] && ![string match auto_* $p] - && ([lsearch -exact {unknown pkg_mkIndex tclPkgSetup tcl_findLibrary + && ([lsearch -exact {unknown pkg_mkIndex tclPkgSetup + tcl_findLibrary pkg_compareExtension tclMacPkgSearch tclPkgUnknown} $p] < 0)} { rename $p {} } @@ -50,7 +51,7 @@ proc auto_reset {} { proc tcl_findLibrary {basename version patch initScript enVarName varName} { upvar #0 $varName the_library - global env + global env errorInfo set dirs {} set errors {} @@ -87,12 +88,12 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { lappend dirs [file join $grandParentDir lib $basename$version] lappend dirs [file join $parentDir library] lappend dirs [file join $grandParentDir library] - if [string match {*[ab]*} $patch] { + if {[string match {*[ab]*} $patch]} { set ver $patch } else { set ver $version } - lappend dirs [file join $grandParentDir] $basename$ver library] + lappend dirs [file join $grandParentDir $basename$ver library] lappend dirs [file join [file dirname $grandParentDir] $basename$ver library] } foreach i $dirs { |