merge 8.5. update changes.

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]