From 4edf3efdf3200606313e7882078d7faea7153816 Mon Sep 17 00:00:00 2001 From: Jesse Hills <3060199+jesserockz@users.noreply.github.com> Date: Thu, 2 Nov 2023 17:06:09 +1300 Subject: [PATCH] Fix return value of run_external_command (#5657) --- esphome/util.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/esphome/util.py b/esphome/util.py index ab9fa82414..d9c8502e0e 100644 --- a/esphome/util.py +++ b/esphome/util.py @@ -222,7 +222,7 @@ def run_external_command( try: sys.argv = list(cmd) sys.exit = mock_exit - return func() or 0 + retval = func() or 0 except KeyboardInterrupt: # pylint: disable=try-except-raise raise except SystemExit as err: @@ -238,9 +238,10 @@ def run_external_command( sys.stdout = orig_stdout sys.stderr = orig_stderr - if capture_stdout: - # pylint: disable=lost-exception - return cap_stdout.getvalue() + if capture_stdout: + return cap_stdout.getvalue() + + return retval def run_external_process(*cmd, **kwargs):