summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreask <andreask>2013-01-30 19:04:50 (GMT)
committerandreask <andreask>2013-01-30 19:04:50 (GMT)
commitee3f25a10fee8fb2301a01194f6f73b949651986 (patch)
treef4d1c6af85213a5d8ccb0316c434a9d9722355fa
parent16fde830643c564edad1860bb44ba4a943fe2873 (diff)
downloadtcl-ee3f25a10fee8fb2301a01194f6f73b949651986.zip
tcl-ee3f25a10fee8fb2301a01194f6f73b949651986.tar.gz
tcl-ee3f25a10fee8fb2301a01194f6f73b949651986.tar.bz2
(::platform::LibcVersion): See [Bug 3599098]: Fixed the RE extracting
the version to avoid issues with recent changes to the glibc banner. Now targeting a less variable part of the string. Bumped package to version 1.0.11.
-rw-r--r--ChangeLog8
-rw-r--r--library/platform/pkgIndex.tcl2
-rw-r--r--library/platform/platform.tcl4
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 941edb0..dec2b74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-30 Andreas Kupries <andreask@activestate.com>
+
+ * library/platform/platform.tcl (::platform::LibcVersion): See
+ * library/platform/pkgIndex.tcl: [Bug 3599098]: Fixed the RE
+ extracting the version to avoid issues with recent changes to
+ the glibc banner. Now targeting a less variable part of the
+ string. Bumped package to version 1.0.11.
+
2013-01-26 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tclUnixCompat.c: [Bug 3601804]: platformCPUID segmentation
diff --git a/library/platform/pkgIndex.tcl b/library/platform/pkgIndex.tcl
index 220a67b..b882e4f 100644
--- a/library/platform/pkgIndex.tcl
+++ b/library/platform/pkgIndex.tcl
@@ -1,3 +1,3 @@
-package ifneeded platform 1.0.10 [list source [file join $dir platform.tcl]]
+package ifneeded platform 1.0.11 [list source [file join $dir platform.tcl]]
package ifneeded platform::shell 1.1.4 [list source [file join $dir shell.tcl]]
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl
index dd2e66b..a1a728b 100644
--- a/library/platform/platform.tcl
+++ b/library/platform/platform.tcl
@@ -256,7 +256,7 @@ proc ::platform::LibcVersion {base _->_ vv} {
if {![catch {
set vdata [lindex [split [exec $libc] \n] 0]
}]} {
- regexp {([0-9]+(\.[0-9]+)*)} $vdata -> v
+ regexp {version ([0-9]+(\.[0-9]+)*), by} $vdata -> v
foreach {major minor} [split $v .] break
set v glibc${major}.${minor}
return 1
@@ -368,7 +368,7 @@ proc ::platform::patterns {id} {
# ### ### ### ######### ######### #########
## Ready
-package provide platform 1.0.10
+package provide platform 1.0.11
# ### ### ### ######### ######### #########
## Demo application