From 233145f0805fc60918ff8fca78851c2d8ca4abe5 Mon Sep 17 00:00:00 2001 From: Alexander Koskovich Date: Mon, 16 Jun 2025 23:15:34 -0400 Subject: [PATCH] superproject: Fix crash when _git_event_log is None File "${AOSP_ROOT}/.repo/repo/subcmds/info.py", line 106, in Execute srev = sp.commit_id if sp and sp.commit_id else "None" ^^^^^^^^^^^^ File "${AOSP_ROOT}/.repo/repo/git_superproject.py", line 146, in commit_id self._LogWarning( ~~~~~~~~~~~~~~~~^ "git rev-parse call failed, command: git {}, " ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...<3 lines>... p.stderr, ^^^^^^^^^ ) ^ File "${AOSP_ROOT}/.repo/repo/git_superproject.py", line 207, in _LogWarning self._LogMessage(f"warning: {fmt}", *inputs) ~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "${AOSP_ROOT}/.repo/repo/git_superproject.py", line 193, in _LogMessage self._git_event_log.ErrorEvent(message, fmt) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AttributeError: 'NoneType' object has no attribute 'ErrorEvent' Test: repo info -o with and without superproject Change-Id: I3267eccd09df3a7bc71f9461be807dedd8082cfb --- git_superproject.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git_superproject.py b/git_superproject.py index d808bb093..2ef6df16c 100644 --- a/git_superproject.py +++ b/git_superproject.py @@ -190,7 +190,8 @@ class Superproject: message = f"{self._LogMessagePrefix()} {fmt.format(*inputs)}" if self._print_messages: print(message, file=sys.stderr) - self._git_event_log.ErrorEvent(message, fmt) + if self._git_event_log: + self._git_event_log.ErrorEvent(message, fmt) def _LogMessagePrefix(self): """Returns the prefix string to be logged in each log message"""