Skip to content

Accept abbreviated upper bounds in version ranges #699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adrien-cotte wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −1
Open

Accept abbreviated upper bounds in version ranges #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ Modules 5.7.0 (not yet released)
* Doc: add the :ref:`user-guide` document that explains a selection of
useful but lesser known features through practical examples and common
use cases.
* Accept abbreviated upper bounds in version ranges such as ``@3.20:3`` to
select versions starting at ``3.20`` within major version ``3``.
* Init: fix command injection in Bash completion when module names contain
shell meta-characters. Completion candidates were passed to ``compgen -W``
which evaluates command substitution syntax. (fix `CVE-2026-85013`_ found
Expand Down
3 changes: 3 additions & 0 deletions doc/source/module.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3235,6 +3235,9 @@ the activation of the extended default mechanism (see
to refer to more precise version numbers like ``1.2.3``. Characters ``.`` and
``-`` are considered version number separator to determine abbreviated
versions. Range of versions on its side natively handles abbreviated versions.
The upper bound may be less precise than the lower bound. An abbreviated
upper bound includes all versions that extend it, provided they also satisfy
the lower bound.

In order to be specified in a range of versions or compared to a range of
versions, the version major element should corresponds to a number. For
Expand Down
4 changes: 3 additions & 1 deletion tcl/modspec.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,9 @@ proc parseModuleVersionSpecifier {modspec} {
set cmpspec le
set versspec $hivers
# between or equal
} elseif {[versioncmp $lovers $hivers] == 1} {
# An abbreviated upper bound includes its more precise versions.
} elseif {[versioncmp $lovers $hivers] == 1 && ![string match\
$hivers[extendedDefaultCharGlobMatch] $lovers]} {
set invalidversrange 1
} else {
set cmpspec be
Expand Down
15 changes: 15 additions & 0 deletions testsuite/modules.70-maint/272-adv_version_spec-range.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ testouterr_cmd sh {load mod@1::} ERR "$err_specvers'1::'"
testouterr_cmd sh {load mod@1,:,} ERR "$err_specvers'1,:,'"
testouterr_cmd sh {load mod@,:} ERR "$err_specvers',:'"
testouterr_cmd sh {load mod@1.3:1.2} ERR "$err_rangevers'1.3:1.2'"
testouterr_cmd sh {load mod@4.1:3} ERR "$err_rangevers'4.1:3'"
testouterr_cmd sh {load mod@1.30:1.3} ERR "$err_rangevers'1.30:1.3'"
testouterr_cmd sh {load mod@,<} ERR "$err_specvers',<'"
testouterr_cmd sh {load mod@:<} ERR "$err_rangevers':<'"
testouterr_cmd sh {load mod@1/1:2} ERR "$err_specvers'1/1:2'"
Expand Down Expand Up @@ -113,6 +115,7 @@ testouterr_cmd sh {load extdfl @1.2:} $ans {}
testouterr_cmd sh {load extdfl @:1.3.1} $ans {}
testouterr_cmd sh {load extdfl @:1.3.7} $ans {}
testouterr_cmd sh {load extdfl @1.2:1.3} $ans {}
testouterr_cmd sh {load extdfl @1.2:1} $ans {}
testouterr_cmd sh {load extdfl @1.2.3:1.3.7} $ans {}
testouterr_cmd sh {load extdfl @:2.0.1} $ans {}
testouterr_cmd sh {load extdfl @:2.0} $ans {}
Expand Down Expand Up @@ -187,6 +190,18 @@ testouterr_cmd sh {spider -t ext?fl @1.3:} OK "$mp:\nextdfl/1.3.1(default)\nextd
testouterr_cmd sh {avail -t e??.* @:1.4} OK "$mp:\ne.t.fl/1.3.1\ne.t.fl/1.3.7\ne.t.fl/1.4.5"

# additional version tests
# Abbreviated upper bounds apply independently of extended defaults.
foreach extdfl {0 1} {
setenv_var MODULES_EXTENDED_DEFAULT $extdfl
set ans [list [list text $mp/extdfl/1.3.7] [list text $mp/extdfl/1.4.5]]
testouterr_cmd sh {paths extdfl@1.3.7:1} $ans {}
testouterr_cmd sh {paths -i EXTDFL@1.3.7:1} $ans {}
set ans [list [list text $mp/extdfl/1.3.7]]
testouterr_cmd sh {paths extdfl@1.3.7:1.3} $ans {}
testouterr_cmd sh {paths extdfl@1.3.7:1.3,9:10} $ans {}
}
unsetenv_var MODULES_EXTENDED_DEFAULT

testouterr_cmd sh {avail -t extdfl8 @1.33:} OK "$mp:\nextdfl8/1.33"
testouterr_cmd sh {avail -t extdfl8 @:1.3} OK "$mp:\nextdfl8/1.3.1\nextdfl8/1.3.7"
testouterr_cmd sh {spider -t extdfl8 @:1.3} OK "$mp:\nextdfl8/1.3.1\nextdfl8/1.3.7"
Expand Down