diff options
author | dgp <dgp@users.sourceforge.net> | 2016-08-26 13:46:37 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2016-08-26 13:46:37 (GMT) |
commit | f2115ca0855e6d7ed4c7f8a069b3abc054579390 (patch) | |
tree | 4432e6fc498d08f58e7cbc0ea55a86f5f3c1df8c /library/auto.tcl | |
parent | d823d4a2d57b7cc68a6e3e158f0d0946af2f3224 (diff) | |
download | tcl-f2115ca0855e6d7ed4c7f8a069b3abc054579390.zip tcl-f2115ca0855e6d7ed4c7f8a069b3abc054579390.tar.gz tcl-f2115ca0855e6d7ed4c7f8a069b3abc054579390.tar.bz2 |
Merge dup-removal into search loop so we avoid pre-processing efforts on
data that are never used. Contributed patch from Brian Griffin.
Diffstat (limited to 'library/auto.tcl')
-rw-r--r-- | library/auto.tcl | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/library/auto.tcl b/library/auto.tcl index 02edcc4..97ea8af 100644 --- a/library/auto.tcl +++ b/library/auto.tcl @@ -122,11 +122,9 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { # uniquify $dirs in order array set seen {} foreach i $dirs { - # Take note that the [file normalize] below has been noted to cause - # difficulties for the freewrap utility. See Bug 1072136. Until - # freewrap resolves the matter, one might work around the problem by - # disabling that branch. + # Make sure $i is unique under normalization. Avoid repeated [source]. if {[interp issafe]} { + # Safe interps have no [file normalize]. set norm $i } else { set norm [file normalize $i] @@ -135,10 +133,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { continue } set seen($norm) {} - lappend uniqdirs $i - } - set dirs $uniqdirs - foreach i $dirs { + set the_library $i set file [file join $i $initScript] |