Skip to content

Commit 422ded7

Browse files
tools: add exit error codes when a project name is invalid or git throws errors (#910)
* tools: Add error exit code when project name provided is invalid. Not a simple way to check if a generator is empty without consuming it, so just use a flag. * tools: Check error code from generate_version_file().
1 parent 37bc06c commit 422ded7

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

tools/mbedcli_compile.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ def main():
7777
print("Error - this script must be run from the tools directory")
7878
exit(-1)
7979
version_git_dir = os.path.join(daplink_dir, "source", "daplink")
80-
generate_version_file(version_git_dir)
80+
error = generate_version_file(version_git_dir)
81+
if error:
82+
exit(-1)
8183
if not args.projects == []:
8284
for project in args.projects:
8385
print("Compiling %s" % project)

tools/progen_compile.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,18 @@ def get_core_count():
100100
if len(args.projects) > 0:
101101
logger.warning("A release can should only be done on all packages")
102102
version_git_dir = os.path.join(daplink_dir, "source", "daplink")
103-
generate_version_file(version_git_dir)
103+
error = generate_version_file(version_git_dir)
104+
if error:
105+
exit(-1)
104106

105107
# Build the project(s)
106108
cores = get_core_count() if args.parallel else 1
107109
projects = args.projects if len(args.projects) > 0 else project_list
108110
generator = generate.Generator(PROJECTS_YAML)
109111
for p_name in projects:
112+
p_valid = False
110113
for project in generator.generate(p_name):
114+
p_valid = True
111115
failed = False
112116
if hasattr(project, 'workspace_name') and (project.workspace_name is not None):
113117
logger.info("Generating %s for %s in workspace %s", toolchain, project.name, project.workspace_name)
@@ -126,6 +130,8 @@ def get_core_count():
126130
failed = True
127131
if failed and not args.ignore_failures:
128132
exit(-1)
133+
if not p_valid:
134+
exit(-1)
129135

130136
# Generate images with boardid / familyid for supported configurations
131137
if args.release or args.supported:

0 commit comments

Comments
 (0)