Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-27 09:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Re-raise keyboardinterrupt (#2603)

Browse source
This commit is contained in:
Otto Winter 2021-10-22 14:14:07 +02:00 committed by Otto winter
parent 5be52f71f9
commit ff2c316b18
No known key found for this signature in database
GPG key ID: 48ED2DDB96D7682C
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
esphome/util.py
View file

@ -192,8 +192,8 @@ def run_external_command(
sys.argv = list(cmd) sys.argv = list(cmd)
sys.exit = mock_exit sys.exit = mock_exit
return func() or 0 return func() or 0
except KeyboardInterrupt: except KeyboardInterrupt: # pylint: disable=try-except-raise
return 1 raise
except SystemExit as err: except SystemExit as err:
return err.args[0] return err.args[0]
except Exception as err: # pylint: disable=broad-except except Exception as err: # pylint: disable=broad-except
@ -227,6 +227,8 @@ def run_external_process(*cmd, **kwargs):
try: try:
return subprocess.call(cmd, stdout=sub_stdout, stderr=sub_stderr) return subprocess.call(cmd, stdout=sub_stdout, stderr=sub_stderr)
except KeyboardInterrupt: # pylint: disable=try-except-raise
raise
except Exception as err: # pylint: disable=broad-except except Exception as err: # pylint: disable=broad-except
_LOGGER.error("Running command failed: %s", err) _LOGGER.error("Running command failed: %s", err)
_LOGGER.error("Please try running %s locally.", full_cmd) _LOGGER.error("Please try running %s locally.", full_cmd)