Tighten the review-round edges

Only IncompatiblePlatform counts as a knowing skip; other malformed
manifest data stays out of the satisfied set so the reconciliation can
still flag a broken promise. Backend-provided names are recorded before
the manifest-name evidence so the overlap warns once, in the backend's
own suppression loop. ar runs rcs/qs so the symbol index is explicit,
and the copy shim prints and returns 1 like its siblings instead of
re-raising.
This commit is contained in:
J. Nick Koston
2026-08-25 23:42:13 -05:00
parent b957fb0712
commit 21fd74b201
4 changed files with 40 additions and 32 deletions
+7 -1
View File
@@ -28,6 +28,7 @@ from esphome.platformio.library import (
LIBRARY_HEADER_SUFFIXES,
SRC_FILE_EXTENSIONS,
ConvertedLibrary,
IncompatiblePlatform,
InvalidLibrary,
LibraryBackend,
_url_or_none,
@@ -457,11 +458,16 @@ def resolve_libraries(
# causes; debug keeps one fault from warning twice (pinned
# by test_nonplatform_rejection_warns_once_through_real_converter)
check_library_data(dep, pio_platform, None)
except InvalidLibrary as err:
except IncompatiblePlatform as err:
# A knowing skip (platform filter), not a broken promise
knowingly_skipped.add(name)
_LOGGER.debug("Skip bundled candidate %s: %s", name, err)
continue
except InvalidLibrary as err:
# Malformed manifest data never counts as satisfied; the
# walk owns the warning (see the warns-once test above)
_LOGGER.debug("Skip malformed bundled candidate %s: %s", name, err)
continue
# Deferred: a later manifest name may satisfy this
pending_bundled.setdefault(name)
+6 -5
View File
@@ -44,9 +44,9 @@ def _run_ar(ar: str, archive: str, rspfile: str) -> int:
print(f"ar: no objects listed in {rspfile} for {archive}", file=sys.stderr)
return 1
# Batch by argv length: expanding the rspfile gives back the Windows
# 32767-char command-line limit it existed to avoid. "rc" creates,
# "q" appends the remainder.
op = "rc"
# 32767-char command-line limit it existed to avoid. "rcs" creates,
# "qs" appends; the s keeps the symbol index explicit on every ar.
op = "rcs"
ok = False
try:
while objects:
@@ -60,7 +60,7 @@ def _run_ar(ar: str, archive: str, rspfile: str) -> int:
).returncode
if rc != 0:
return rc
op = "q"
op = "qs"
ok = True
return 0
finally:
@@ -78,7 +78,8 @@ def _run_copy(src: str, dst: str) -> int:
# SameFileError means dst IS src, where unlinking destroys the input
if not isinstance(err, shutil.SameFileError):
Path(dst).unlink(missing_ok=True)
raise
print(f"copy: {src} -> {dst} failed: {err}", file=sys.stderr)
return 1
return 0
+11 -9
View File
@@ -943,6 +943,17 @@ def _reconcile_versionless_skips(
if dep_name in components:
# A version-less dep's request key is the name itself
continue
if (
not dep_owner
and backend.provides is not None
and backend.provides(dep_name)
):
# provides() only satisfies owner-less names (same guard as
# the walk's skip); record for the post-emit reconciliation.
# Checked before the manifest-name evidence so the overlap
# case warns once, in the backend's own suppression loop
backend.provided_requests.add(dep_name)
continue
if dep_name in resolved_manifest_names:
# Name-only evidence: a coincidental collision must stay
# visible where the user could pin it
@@ -954,15 +965,6 @@ def _reconcile_versionless_skips(
requester,
)
continue
if (
not dep_owner
and backend.provides is not None
and backend.provides(dep_name)
):
# provides() only satisfies owner-less names (same guard as
# the walk's skip); record for the post-emit reconciliation
backend.provided_requests.add(dep_name)
continue
warned.add(dep_name)
log(
"Dependency %s of %s has no version to resolve and nothing "