diff options
| author | andreask <andreask> | 2013-01-30 19:18:52 (GMT) |
|---|---|---|
| committer | andreask <andreask> | 2013-01-30 19:18:52 (GMT) |
| commit | 6a27aae72c76f68c63aa85b9bc8f159385534102 (patch) | |
| tree | 0006b49027c8d626773031038e9ad7c97199e0aa /library | |
| parent | 3ac002a666fce71f19f025288d9e18c0819bb91a (diff) | |
| parent | ee3f25a10fee8fb2301a01194f6f73b949651986 (diff) | |
| download | tcl-6a27aae72c76f68c63aa85b9bc8f159385534102.zip tcl-6a27aae72c76f68c63aa85b9bc8f159385534102.tar.gz tcl-6a27aae72c76f68c63aa85b9bc8f159385534102.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.
Diffstat (limited to 'library')
| -rw-r--r-- | library/platform/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | library/platform/platform.tcl | 4 |
2 files changed, 3 insertions, 3 deletions
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 |