diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-14 10:25:52 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-14 10:25:52 (GMT) |
commit | 02b1b013df6db99985c373a714155ddd29c8819d (patch) | |
tree | f29ea97fd2ed810f3d1aa4d8cfe0bab77f16e141 | |
parent | b8bffd00e36251f0126d02b73f1e84c24b912ab9 (diff) | |
parent | 2ef9dcb65faae43f66ba1ed0dedeac2496d2b3ba (diff) | |
download | tcl-02b1b013df6db99985c373a714155ddd29c8819d.zip tcl-02b1b013df6db99985c373a714155ddd29c8819d.tar.gz tcl-02b1b013df6db99985c373a714155ddd29c8819d.tar.bz2 |
Merge 8.6
-rw-r--r-- | library/tm.tcl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/library/tm.tcl b/library/tm.tcl index 1802bb9..0ed3f1a 100644 --- a/library/tm.tcl +++ b/library/tm.tcl @@ -238,12 +238,16 @@ proc ::tcl::tm::UnknownHandler {original name args} { continue } - if {[package ifneeded $pkgname $pkgversion] ne {}} { + if {([package ifneeded $pkgname $pkgversion] ne {}) + && (![interp issafe]) + } { # There's already a provide script registered for # this version of this package. Since all units of # code claiming to be the same version of the same # package ought to be identical, just stick with # the one we already have. + # This does not apply to Safe Base interpreters because + # the token-to-directory mapping may have changed. continue } |