Skip to content

Commit

Permalink
Let ls operate on all vendors by default
Browse files Browse the repository at this point in the history
  • Loading branch information
ctrueden committed Aug 2, 2024
1 parent d38d3de commit 5377c92
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 2 deletions.
20 changes: 19 additions & 1 deletion src/cjdk/_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,25 @@ def _get_vendors(**kwargs):


def _get_jdks(*, vendor=None, version=None, cached_only=True, **kwargs):
conf = _conf.configure(vendor=vendor, version=version, **kwargs)
conf = _conf.configure(
vendor=vendor,
version=version,
fallback_to_default_vendor=False,
**kwargs,
)
if conf.vendor is None:
# Search across all vendors.
kwargs.pop("jdk", None) # It was already parsed.
return [
jdk
for v in sorted(_get_vendors())
for jdk in _get_jdks(
vendor=v,
version=conf.version,
cached_only=cached_only,
**kwargs,
)
]
index = _index.jdk_index(conf)
jdks = _index.available_jdks(index, conf)
versions = _index._get_versions(jdks, conf)
Expand Down
7 changes: 6 additions & 1 deletion src/cjdk/_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,15 @@ def configure(**kwargs):
raise ValueError("Cannot specify jdk= together with version=")
kwargs["vendor"], kwargs["version"] = _parse_vendor_version(jdk)

default_vendor = (
_default_vendor()
if kwargs.pop("fallback_to_default_vendor", True)
else None
)
conf = Configuration(
os=_canonicalize_os(kwargs.pop("os", None)),
arch=_canonicalize_arch(kwargs.pop("arch", None)),
vendor=kwargs.pop("vendor", None) or _default_vendor(),
vendor=kwargs.pop("vendor", None) or default_vendor,
version=kwargs.pop("version", "") or "",
cache_dir=kwargs.pop("cache_dir", None) or _default_cachedir(),
index_url=kwargs.pop("index_url", None) or _default_index_url(),
Expand Down

0 comments on commit 5377c92

Please sign in to comment.