espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/log-error-run-esptool_v4.1' into 'release/v4.1'

Browse Source 
parttool.py: Add file stream parameter and log stdout and stderr to same stream (v4.1)

See merge request espressif/esp-idf!10517
This commit is contained in:
Ivan Grokhotkov
2020-12-11 16:55:09 +08:00
parent 3217cd4734 6870c87aac
commit 77be96fd87
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/partition_table/parttool.py
View File

@@ -117,6 +117,9 @@ class ParttoolTarget():
self.partition_table = partition_table self.partition_table = partition_table
# set `out` to None to redirect the output to the STDOUT
# otherwise set `out` to file descriptor
# beware that the method does not close the file descriptor
def _call_esptool(self, args, out=None): def _call_esptool(self, args, out=None):
esptool_args = [sys.executable, ESPTOOL_PY] + self.esptool_args esptool_args = [sys.executable, ESPTOOL_PY] + self.esptool_args
@@ -128,8 +131,12 @@ class ParttoolTarget():
esptool_args += args esptool_args += args
with open(os.devnull, "w") as null_file: print("Running %s..." % (" ".join(esptool_args)))
subprocess.check_call(esptool_args, stdout=null_file, stderr=null_file) try:
subprocess.check_call(esptool_args, stdout=out, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
print("An exception: **", str(e), "** occurred in _call_esptool.", file=out)
raise e
def get_partition_info(self, partition_id): def get_partition_info(self, partition_id):
partition = None partition = None