Skip to content

Commit bd515ce

Browse files
Merge pull request #649 from EmilienM/637
fix: propagate exceptions in Bootstrapper._build_sdist to fail on sdist build errors
2 parents 948af39 + 13be4df commit bd515ce

1 file changed

Lines changed: 13 additions & 25 deletions

File tree

src/fromager/bootstrapper.py

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -375,32 +375,20 @@ def _build_sdist(
375375
sdist_root_dir: pathlib.Path,
376376
build_env: build_environment.BuildEnvironment,
377377
) -> pathlib.Path:
378-
sdist_filename: pathlib.Path | None = None
379-
try:
380-
find_sdist_result = finders.find_sdist(
381-
self.ctx, self.ctx.sdists_builds, req, str(resolved_version)
378+
find_sdist_result = finders.find_sdist(
379+
self.ctx, self.ctx.sdists_builds, req, str(resolved_version)
380+
)
381+
if not find_sdist_result:
382+
sdist_filename = sources.build_sdist(
383+
ctx=self.ctx,
384+
req=req,
385+
version=resolved_version,
386+
sdist_root_dir=sdist_root_dir,
387+
build_env=build_env,
382388
)
383-
if not find_sdist_result:
384-
sdist_filename = sources.build_sdist(
385-
ctx=self.ctx,
386-
req=req,
387-
version=resolved_version,
388-
sdist_root_dir=sdist_root_dir,
389-
build_env=build_env,
390-
)
391-
else:
392-
sdist_filename = find_sdist_result
393-
logger.info(
394-
f"have sdist version {resolved_version}: {find_sdist_result}"
395-
)
396-
except Exception as err:
397-
logger.warning(f"failed to build source distribution: {err}")
398-
# Re-raise the exception since we cannot continue without a sdist
399-
raise
400-
401-
if sdist_filename is None:
402-
raise RuntimeError(f"Failed to build or find sdist for {req}")
403-
389+
else:
390+
sdist_filename = find_sdist_result
391+
logger.info(f"have sdist version {resolved_version}: {find_sdist_result}")
404392
return sdist_filename
405393

406394
def _build_wheel(

0 commit comments

Comments
 (0)