From fec62fc770b9ed7d7ae0fa98559acdbc1243df7a Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Thu, 10 Jun 2021 19:28:40 +0300 Subject: Fix exception propagation in event_register The __aexit__ should return False to propagate the exception. If the --event-injector was not given the class variable 'event_register.event_injector' was not initialized and the return value was wrongly set. Fix it so that the return value is set correctly no matter if the event injector is enabled or not. Change-Id: Ie1b19deae4befcf39acccedd2af995b6c6aa1da4 Reviewed-by: Akseli Salovaara --- packaging-tools/qt6_installer/release_repo_updater.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging-tools/qt6_installer/release_repo_updater.py b/packaging-tools/qt6_installer/release_repo_updater.py index b07cb7501..b228edd1d 100755 --- a/packaging-tools/qt6_installer/release_repo_updater.py +++ b/packaging-tools/qt6_installer/release_repo_updater.py @@ -93,11 +93,11 @@ class event_register(object): async def __aexit__(self, exc_type, exc_val, traceback) -> bool: ret = True + event_type = "FINISH" + if traceback: + ret = False # will cause the exception to be propagated + event_type = "ABORT" if event_register.event_injector: - event_type = "FINISH" - if traceback: - ret = False # will cause the exception to be propagated - event_type = "ABORT" self.register_event(self.event_name, event_type, self.summary_data, message=exc_val) return ret -- cgit v1.2.3