Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-23 11:56:25 +01:00
Code Issues Projects Releases Wiki Activity

Respect ESPHOME_USE_SUBPROCESS in esp32 post_build script (#3246)

Browse Source
This commit is contained in:
Martin Weinelt 2022-02-21 02:05:13 +01:00 committed by Jesse Hills
parent 138d6e505b
commit 3d0899aa58
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
esphome/components/esp32/post_build.py.script
View File

@ -1,6 +1,10 @@
# Source https://github.com/letscontrolit/ESPEasy/pull/3845#issuecomment-1005864664 # Source https://github.com/letscontrolit/ESPEasy/pull/3845#issuecomment-1005864664
import esptool import os
if os.environ.get("ESPHOME_USE_SUBPROCESS") is None:
import esptool
else:
import subprocess
from SCons.Script import ARGUMENTS from SCons.Script import ARGUMENTS
# pylint: disable=E0602 # pylint: disable=E0602
@ -42,8 +46,11 @@ def esp32_create_combined_bin(source, target, env):
print() print()
print(f"Using esptool.py arguments: {' '.join(cmd)}") print(f"Using esptool.py arguments: {' '.join(cmd)}")
print() print()
esptool.main(cmd)
if os.environ.get("ESPHOME_USE_SUBPROCESS") is None:
esptool.main(cmd)
else:
subprocess.run(["esptool.py", *cmd])
# pylint: disable=E0602 # pylint: disable=E0602
env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin) # noqa env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin) # noqa