fix: never drop a held file for a missing region

Region filtering ranked every declared file, held or not, so a request
answered only by a missing file dropped the held fallback and emptied
the slot. Only held files now decide what gives way; the missing better
match stays reported.
This commit is contained in:
Abdessamad Derraz committed 2026-10-17 18:31:56 +02:00
1 parent 5cfcb9e746
commit e6c29452f9
6 files changed
+69 -8

No files matched your search

+6 -2
View File
@@ -476,6 +476,7 @@ def _select_variants(
# One grouping for both passes: a file judged in its own system by one
# pass must not land in every system of its profile for the other.
region_groups: dict[str, list[tuple[str, str]]] = {}
held: set[str] = set()
if regions or one_per_slot:
region_groups, _extra_dests = platform_region_groups(
config,
@@ -488,13 +489,14 @@ def _select_variants(
include_extras=(source != "platform"),
include_all=(source == "truth"),
required_only=required_only,
held_out=held,
)
if regions:
region_index = region_mod.platform_region_index(
config, emu_profiles or {}, target_cores
)
region_drops = region_mod.resolve_region_drops(
region_groups, region_index, regions
region_groups, region_index, regions, held
)
region_fallbacks = region_mod.fallback_groups(
region_groups, region_index, regions
@@ -3528,6 +3530,7 @@ def _manifest_selection(
the full manifest withdraws what `--region` withdraws from the pack.
"""
extras: list[dict] = []
held: set[str] = set()
region_groups, _extra_dests = platform_region_groups(
config,
pack_systems,
@@ -3540,12 +3543,13 @@ def _manifest_selection(
include_all=(source == "truth"),
required_only=required_only,
extras_out=extras,
held_out=held,
)
region_index = region_mod.platform_region_index(
config, emu_profiles, target_cores
)
drops = (
region_mod.resolve_region_drops(region_groups, region_index, regions)
region_mod.resolve_region_drops(region_groups, region_index, regions, held)
if regions
else set()
)