starlingx/root
Code Issues Proposed changes

merge-topic.py: better error handling

Browse Source 
Signed-off-by: Scott Little <scott.little@windriver.com>
Change-Id: I42d06386d6514b732340f33d5d9ec9c4e516dd61
This commit is contained in:
Scott Little
2025-06-11 14:33:45 -04:00
parent fb74046ac9
commit c80bcae82d
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build-tools/merge-topic/merge-topic.py
View File

@@ -322,7 +322,8 @@ def handleRepo(args):
pprint.pprint(e) pprint.pprint(e)
if dargs['merge_fixer'] and not dargs['dry_run']: if dargs['merge_fixer'] and not dargs['dry_run']:
print('Using merge fixer!') print('Using merge fixer!')
runMergeFixer(dargs, project_path, tool_cwd) rc = runMergeFixer(dargs, project_path, tool_cwd)
return rc
else: else:
print('Check for unresolved merge conflict') print('Check for unresolved merge conflict')
return False return False
@@ -447,10 +448,14 @@ def main():
args = parser.parse_args() args = parser.parse_args()
if hasattr(args, 'handle'): if hasattr(args, 'handle'):
args.handle(args) rc = args.handle(args)
if not rc:
return 1
else: else:
parser.print_help() parser.print_help()
return 1
if __name__ == '__main__': if __name__ == '__main__':
main() exit_code = main()
sys.exit(exit_code)