diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-08-30 13:41:27 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-08-30 13:41:27 (GMT) |
| commit | ace4e59005f688b30673cc4aefd89a0797a71191 (patch) | |
| tree | ca492e0846bc9e31d5569e24e3de8c4d69783f1b /library | |
| parent | 1a2e9e655fa7b3463b321e543537d16a0087bae5 (diff) | |
| parent | 5eb346e0d25b2ae446797b610058911dc3b65a63 (diff) | |
| download | tcl-ace4e59005f688b30673cc4aefd89a0797a71191.zip tcl-ace4e59005f688b30673cc4aefd89a0797a71191.tar.gz tcl-ace4e59005f688b30673cc4aefd89a0797a71191.tar.bz2 | |
merge trunk
Diffstat (limited to 'library')
| -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 3a93f0e..346679d 100644 --- a/library/auto.tcl +++ b/library/auto.tcl @@ -124,11 +124,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] @@ -137,10 +135,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] |