From a0b754bb4d4ae96dc53b8350fa62baba7d4f20c2 Mon Sep 17 00:00:00 2001 From: pconroy Date: Thu, 1 Jul 2021 14:33:12 -0700 Subject: [PATCH] Fix return value when multiple projects are removed and one fails Signed-off-by: pconroy --- scripts/o3de/o3de/register.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/o3de/o3de/register.py b/scripts/o3de/o3de/register.py index d1029ee47f..2eb9cd45be 100644 --- a/scripts/o3de/o3de/register.py +++ b/scripts/o3de/o3de/register.py @@ -669,7 +669,9 @@ def remove_invalid_o3de_projects(manifest_path: pathlib.Path = None) -> int: for project in json_data['projects']: if not validation.valid_o3de_project_json(pathlib.Path(project).resolve() / 'project.json'): logger.warn(f"Project path {project} is invalid.") - result = register(project_path=pathlib.Path(project), remove=True) + # Attempt to unregister all invalid projects even if previous projects failed to unregister + # but combine the result codes of each command. + result = register(project_path=pathlib.Path(project), remove=True) or result return result