Skip to content

Commit d0e9029

Browse files
committed
Also consider "-" as version number separator char
Update extended_default mechanism to also consider "-" as a version number separator character. This is useful for instance when using modules generated by Spack with a module projection including the package installation hash. Like for ".", version chunks after a "-" are compared in a "dictionary sort" manner (10-b34d72c is greater than 10-a45e83d). Fixes #619 Signed-off-by: Xavier Delaruelle <xavier.delaruelle@cea.fr>
1 parent b7a1a5d commit d0e9029

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

tcl/modspec.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ proc defineDoesModMatchAtDepthProc {contains querydepth test} {
242242
}
243243

244244
proc extendedDefaultCharGlobMatch {} {
245-
return {.*}
245+
return {[-.]*}
246246
}
247247

248248
# Define procedure to check module version equals pattern. Adapt procedure

testsuite/modules.70-maint/260-extended_default.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ setenv_var MODULES_EXTENDED_DEFAULT 1
8181

8282
# test over different kind of module versions
8383
array set exactmatch [list extdfl/1.1.0 1 extdfl/2.0 1]
84-
foreach {query match} [list extdfl/1 extdfl/1.3.1 extdfl/1.0 extdfl/1.0.2 extdfl/1.0.0 ERR extdfl/1.1 extdfl/1.1.0-beta extdfl/1.1.0 extdfl/1.1.0 extdfl/1.2 extdfl/1.2.10 extdfl/1.3 extdfl/1.3.1 extdfl/1.4 extdfl/1.4.5 ext*l/1.4 ERR ext?fl/1.4 ERR extdfl/2 extdfl/2.0.1 extdfl/2.0 extdfl/2.0 extdfl2/3.0 extdfl2/3.0.15 extdfl2/3 extdfl2/3.10.2 extdfl2/3.1 extdfl2/3.1.7 extdfl2/3.9 extdfl2/3.9.2 extdfl2/3.09 extdfl2/3.09.3 extdfl3/1 extdfl3/1.3/4 extdflb ERR extdflb.4 ERR extdflc ERR e.t.fl/1.4 e.t.fl/1.4.5 e??.*/1.4 ERR] {
84+
foreach {query match} [list extdfl/1 extdfl/1.3.1 extdfl/1.0 extdfl/1.0.2 extdfl/1.0.0 extdfl/1.0.0-beta extdfl/1.1 extdfl/1.1.0-beta extdfl/1.1.0 extdfl/1.1.0 extdfl/1.2 extdfl/1.2.10 extdfl/1.3 extdfl/1.3.1 extdfl/1.4 extdfl/1.4.5 ext*l/1.4 ERR ext?fl/1.4 ERR extdfl/2 extdfl/2.0.1 extdfl/2.0 extdfl/2.0 extdfl2/3.0 extdfl2/3.0.15 extdfl2/3 extdfl2/3.10.2 extdfl2/3.1 extdfl2/3.1.7 extdfl2/3.9 extdfl2/3.9.2 extdfl2/3.09 extdfl2/3.09.3 extdfl3/1 extdfl3/1.3/4 extdflb ERR extdflb.4 ERR extdflc ERR e.t.fl/1.4 e.t.fl/1.4.5 e??.*/1.4 ERR] {
8585
if {$match eq {ERR}} {
8686
set ans ERR
8787
set tserr $err_path'$query'

0 commit comments

Comments
 (0)