diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-21 09:36:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-21 09:36:35 (GMT) |
| commit | ae2f2b211d31070531913851b894e2665b544beb (patch) | |
| tree | f85bb98792c720e90346badc16cb7db5dd867027 /library/auto.tcl | |
| parent | 65d17884a3fc402968d737201112e8006e371434 (diff) | |
| parent | 3b786ffebeb7769d34099ea7064532501dc6aee5 (diff) | |
| download | tcl-ae2f2b211d31070531913851b894e2665b544beb.zip tcl-ae2f2b211d31070531913851b894e2665b544beb.tar.gz tcl-ae2f2b211d31070531913851b894e2665b544beb.tar.bz2 | |
merge core-8-6-branch. Undo changes to coffbase.txt (they cause overlap with Tk)winFixes
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] |