Fix exception handling when loading packages (#5569)

This commit is contained in:
dentra 2023-10-25 21:15:25 +03:00 committed by GitHub
parent e80bd8ed3d
commit ec835c0b05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -139,17 +139,22 @@ def _process_base_package(config: dict) -> dict:
) from e
return packages
packages = {}
packages = None
error = ""
try:
packages = get_packages(files)
except cv.Invalid:
if revert is not None:
revert()
packages = get_packages(files)
finally:
if packages is None:
raise cv.Invalid("Failed to load packages")
except cv.Invalid as e:
error = e
try:
if revert is not None:
revert()
packages = get_packages(files)
except cv.Invalid as er:
error = er
if packages is None:
raise cv.Invalid(f"Failed to load packages. {error}")
return {"packages": packages}