From 28103614efb8197bc35e2e0dc9ab97bb42bd951d Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Thu, 22 Sep 2022 14:46:58 -0400
Subject: [PATCH] refactor errorhandler for deduplication of logic

Mostly just move a comment around back to where it's more relevant, and
handle MESON_FORCE_TRACEBACK once instead of twice.
---
 mesonbuild/mesonmain.py | 44 ++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index 03ff6878f..a6d33ef24 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -38,35 +38,33 @@ def errorhandler(e, command):
         if os.environ.get('MESON_FORCE_BACKTRACE'):
             raise e
         return 1
-    elif isinstance(e, OSError):
-        if os.environ.get('MESON_FORCE_BACKTRACE'):
-            raise e
-        traceback.print_exc()
-        error_msg = os.linesep.join([
-            "Unhandled python exception",
-            f"{e.strerror} - {e.args}",
-            "this is probably not a Meson bug."])
-
-        mlog.exception(error_msg)
-        return e.errno
-
-    else: # Exception
-        if os.environ.get('MESON_FORCE_BACKTRACE'):
-            raise e
-        traceback.print_exc()
+    else:
         # We assume many types of traceback are Meson logic bugs, but most
         # particularly anything coming from the interpreter during `setup`.
         # Some things definitely aren't:
         # - PermissionError is always a problem in the user environment
         # - runpython doesn't run Meson's own code, even though it is
         #   dispatched by our run()
-        if command != 'runpython':
-            msg = 'Unhandled python exception'
-            if all(getattr(e, a, None) is not None for a in ['file', 'lineno', 'colno']):
-                e = MesonBugException(msg, e.file, e.lineno, e.colno) # type: ignore
-            else:
-                e = MesonBugException(msg)
-            mlog.exception(e)
+        if os.environ.get('MESON_FORCE_BACKTRACE'):
+            raise e
+        traceback.print_exc()
+
+        if isinstance(e, OSError):
+            error_msg = os.linesep.join([
+                "Unhandled python exception",
+                f"{e.strerror} - {e.args}",
+                "this is probably not a Meson bug."])
+
+            mlog.exception(error_msg)
+            return e.errno
+        else: # Exception
+            if command != 'runpython':
+                msg = 'Unhandled python exception'
+                if all(getattr(e, a, None) is not None for a in ['file', 'lineno', 'colno']):
+                    e = MesonBugException(msg, e.file, e.lineno, e.colno) # type: ignore
+                else:
+                    e = MesonBugException(msg)
+                mlog.exception(e)
         return 2
 
 # Note: when adding arguments, please also add them to the completion