diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-16 15:59:40 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-16 15:59:40 (GMT) |
| commit | fe8f0c596ee02b8811d1d2f4d23b8fdbb166a2ed (patch) | |
| tree | c97e96389c58ac76d16b27fe19ddb3689118e093 /library/auto.tcl | |
| parent | 74cee16544d00f49288f1819fb71e1c5c74ce5ad (diff) | |
| parent | 29606e4a7b43adb9f923fb5781d3b9a93d9ba1c8 (diff) | |
| download | tcl-fe8f0c596ee02b8811d1d2f4d23b8fdbb166a2ed.zip tcl-fe8f0c596ee02b8811d1d2f4d23b8fdbb166a2ed.tar.gz tcl-fe8f0c596ee02b8811d1d2f4d23b8fdbb166a2ed.tar.bz2 | |
merge trunkgahr_ticket_e6f27aa56f
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] |