summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2005-08-29 21:55:27 (GMT)
committerandreas_kupries <akupries@shaw.ca>2005-08-29 21:55:27 (GMT)
commit2e73eedbe37a9f715cd90a7428f6d03648491e8a (patch)
tree0d68034e7146db405d2976bddd036892daac5f6f
parent55f4459894b78e186f016bfd48cacb8a007681c5 (diff)
downloadtcl-2e73eedbe37a9f715cd90a7428f6d03648491e8a.zip
tcl-2e73eedbe37a9f715cd90a7428f6d03648491e8a.tar.gz
tcl-2e73eedbe37a9f715cd90a7428f6d03648491e8a.tar.bz2
* library/tm.tcl (::tcl::tm::roots): Accepted Don Porter's patch
for [Tcl SF Bug 1189657]. Syncs the implementation to the specification (TIP #189).
-rw-r--r--ChangeLog6
-rw-r--r--library/tm.tcl2
-rw-r--r--tests/tm.test4
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b27c0c3..cc28ed4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-29 Andreas Kupries <andreask@activestate.com>
+
+ * library/tm.tcl (::tcl::tm::roots): Accepted Don Porter's patch
+ for [Tcl SF Bug 1189657]. Syncs the implementation to the
+ specification (TIP #189).
+
2005-08-29 Kevin Kenny <kennykb@acm.org>
* generic/tclBasic.c (ExprMathFunc): Restored "round away from
diff --git a/library/tm.tcl b/library/tm.tcl
index 5c05e27..2830ea6 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -353,7 +353,7 @@ proc ::tcl::tm::roots {paths} {
for {set n $minor} {$n >= 0} {incr n -1} {
path add [file normalize [file join $p ${major}.${n}]]
}
- path add [file normalize [file join $pa site-tcl]]
+ path add [file normalize [file join $p site-tcl]]
}
return
}
diff --git a/tests/tm.test b/tests/tm.test
index 9f5a83a..3484747 100644
--- a/tests/tm.test
+++ b/tests/tm.test
@@ -6,7 +6,7 @@
# Copyright (c) 2004 by Donal K. Fellows.
# All rights reserved.
#
-# RCS: @(#) $Id: tm.test,v 1.5 2004/11/05 09:21:46 dkf Exp $
+# RCS: @(#) $Id: tm.test,v 1.6 2005/08/29 21:55:27 andreas_kupries Exp $
package require Tcl 8.5
if {"::tcltest" ni [namespace children]} {
@@ -204,8 +204,8 @@ proc genpaths {base} {
set base [file normalize $base]
foreach {major minor} [split [info tclversion] .] break
set results {}
- lappend results [file join $base site-tcl]
set base [file join $base tcl$major]
+ lappend results [file join $base site-tcl]
for {set i 0} {$i <= $minor} {incr i} {
lappend results [file join $base ${major}.$i]
}