diff options
author | dgp <dgp@users.sourceforge.net> | 2013-09-07 21:36:37 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2013-09-07 21:36:37 (GMT) |
commit | 53c609c3aa4042d00194dc6d3d2bea553ad9d605 (patch) | |
tree | 3ffb9f188177b98d4c9194e4d44a147af6c4443a | |
parent | 43be762ef2c9161d87dcddea3d78084c7c077903 (diff) | |
parent | 7d65b0f9b214a041c9007cf45220fe7c8a5c88f0 (diff) | |
download | tcl-53c609c3aa4042d00194dc6d3d2bea553ad9d605.zip tcl-53c609c3aa4042d00194dc6d3d2bea553ad9d605.tar.gz tcl-53c609c3aa4042d00194dc6d3d2bea553ad9d605.tar.bz2 |
[86ceb4e2b6] Improve reaction when multiple *tm files purport to offer the
same version of the same package. Prefer the file that comes first on
the tm path. Makes TCL*_TM_PATH variables more useful. Thanks to
Gustaf Neumann for the suggestion.
-rw-r--r-- | library/tm.tcl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/library/tm.tcl b/library/tm.tcl index baa268d..7b9cafe 100644 --- a/library/tm.tcl +++ b/library/tm.tcl @@ -248,6 +248,15 @@ proc ::tcl::tm::UnknownHandler {original name args} { continue } + if {[package ifneeded $pkgname $pkgversion] ne {}} { + # 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. + continue + } + # We have found a candidate, generate a "provide # script" for it, and remember it. Note that we # are using ::list to do this; locally [list] |