sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 15:12:06 +00:00
Code Issues Releases Wiki Activity

Fix return value of run_external_command (#5657)

Browse Source
This commit is contained in:
Jesse Hills
2023-11-02 17:06:09 +13:00
committed by GitHub
parent f70d651a39
commit 4edf3efdf3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
esphome/util.py
View File

@@ -222,7 +222,7 @@ def run_external_command(
try: try:
sys.argv = list(cmd) sys.argv = list(cmd)
sys.exit = mock_exit sys.exit = mock_exit
return func() or 0 retval = func() or 0
except KeyboardInterrupt: # pylint: disable=try-except-raise except KeyboardInterrupt: # pylint: disable=try-except-raise
raise raise
except SystemExit as err: except SystemExit as err:
@@ -238,9 +238,10 @@ def run_external_command(
sys.stdout = orig_stdout sys.stdout = orig_stdout
sys.stderr = orig_stderr sys.stderr = orig_stderr
if capture_stdout: if capture_stdout:
# pylint: disable=lost-exception return cap_stdout.getvalue()
return cap_stdout.getvalue()
return retval
def run_external_process(*cmd, **kwargs): def run_external_process(*cmd, **kwargs):