michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: zephyr_module: handle expected west errors

Browse source 
Errors can occur if the user's workspace is not set up properly.
Output a better error message instead of dumping stack in these cases.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
This commit is contained in:
Martí Bolívar 2023-05-18 13:21:34 -07:00 • committed by Carles Cufí
commit ce2a7d9a1a
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts/zephyr_module.py
View file

@ -521,7 +521,9 @@ def west_projects(manifest = None):
# (and thus maybe not installed) # (and thus maybe not installed)
# if user is providing a specific modules list. # if user is providing a specific modules list.
try: try:
from west.manifest import Manifest from west.manifest import Manifest, \
ManifestImportFailed, MalformedManifest, ManifestVersionError
from west.configuration import MalformedConfig
from west.util import WestNotFound from west.util import WestNotFound
from west.version import __version__ as WestVersion from west.version import __version__ as WestVersion
except ImportError: except ImportError:
@ -539,6 +541,9 @@ def west_projects(manifest = None):
projects = manifest.get_projects([]) projects = manifest.get_projects([])
manifest_path = manifest.path manifest_path = manifest.path
return {'manifest_path': manifest_path, 'projects': projects} return {'manifest_path': manifest_path, 'projects': projects}
except (ManifestImportFailed, MalformedManifest,
ManifestVersionError, MalformedConfig) as e:
sys.exit(f'ERROR: {e}')
except WestNotFound: except WestNotFound:
# Only accept WestNotFound, meaning we are not in a west # Only accept WestNotFound, meaning we are not in a west
# workspace. Such setup is allowed, as west may be installed # workspace. Such setup is allowed, as west may be installed