summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-09-07 21:36:37 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-09-07 21:36:37 (GMT)
commitbb55ca2e95ff60cced5834d4c7fd370f5fa5d9b0 (patch)
tree3ffb9f188177b98d4c9194e4d44a147af6c4443a
parent1ecf461e411c890bb2f82fb1c0475581e67a9d86 (diff)
parent0288a572d844408e9cf8bcb3dc27a60e2aaa290c (diff)
downloadtcl-bb55ca2e95ff60cced5834d4c7fd370f5fa5d9b0.zip
tcl-bb55ca2e95ff60cced5834d4c7fd370f5fa5d9b0.tar.gz
tcl-bb55ca2e95ff60cced5834d4c7fd370f5fa5d9b0.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.tcl9
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]