diff options
Diffstat (limited to 'src/sailfish_devel_mcp/vendor')
| -rwxr-xr-x | src/sailfish_devel_mcp/vendor/build_sailfishos.py | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/src/sailfish_devel_mcp/vendor/build_sailfishos.py b/src/sailfish_devel_mcp/vendor/build_sailfishos.py index 98b52c0..c9ad480 100755 --- a/src/sailfish_devel_mcp/vendor/build_sailfishos.py +++ b/src/sailfish_devel_mcp/vendor/build_sailfishos.py @@ -848,12 +848,9 @@ def normalize_local_release(release: str | None) -> str: def requested_release(project_dirs: Iterable[Path], explicit_release: str | None) -> str | None: - if explicit_release: - return explicit_release - - env_release = os.environ.get("SAILFISHOS_RELEASE") - if env_release: - return env_release + requested = explicit_requested_release(explicit_release) + if requested: + return requested seen: set[Path] = set() for project_dir in project_dirs: @@ -867,6 +864,21 @@ def requested_release(project_dirs: Iterable[Path], explicit_release: str | None return None +def explicit_requested_release(explicit_release: str | None) -> str | None: + if explicit_release: + return explicit_release + + env_release = os.environ.get("SAILFISHOS_RELEASE") + if env_release: + return env_release + + return None + + +def local_sdk_requested_release(explicit_release: str | None) -> str: + return normalize_local_release(explicit_requested_release(explicit_release)) or LIVE_RELEASE + + def select_local_sdk_builds( local_sdk: Path, release: str, @@ -1334,11 +1346,10 @@ def main() -> int: project_dir = resolve_project_dir(requested_project_dir) local_sdk_path = Path(args.local_sdk).expanduser().resolve(strict=False) if args.local_sdk else None - raw_release = requested_release((requested_project_dir, project_dir), args.release) - local_release = normalize_local_release(raw_release) or LIVE_RELEASE local_builds: list[LocalSdkBuild] | None = None if local_sdk_path: + local_release = local_sdk_requested_release(args.release) local_builds = select_local_sdk_builds( local_sdk_path, local_release, |