Tools - upload.py exception handling fixes #9186
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- don't check exc_info() in `finally`, it only works without `except` with just `try` and `finally` see https://docs.python.org/3/reference/compound_stmts.html#try after `except Exception as e:` block, `e` is already deleted - handle a rare case when esptool code does not close 'erase_file'. printing paths may cause encoding issues, so just fall through silently
replace temporaries tracking write_flash / erase_region with an append to a generic write_flash_args list. first are actual files, erased ones at the end using atexit for cleanup
1a1f484 to
fe72928
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
don't check exc_info() in
finally, afterexcept Exception as e:block sys module stops tracking ithttps://docs.python.org/3/reference/compound_stmts.html#try
https://docs.python.org/3/library/sys.html#sys.exception
#8603 caused error to appear in the log, but build itself was never stopped properly
edit:
formatting, strict write_flash opts order, atexit & traceback (fe72928)
simplify ordering of
write_flash&erase_regionargumentssince we always end up in
write_flash, prefer to think of it as argument pairs 'addr' + 'path'. actual binaries go first, erase temporaries go last. construct write args beforehand and apply when finishing with the command line.note that this also allows both commands to appear multiple times
(and also to avoid proxying invalid data or possibly misinterpreting everything as write arguments)
it may be reasonable to try to piggyback on esptool parser, but not sure how that would look for upstream
TODO: update to 4.8.1 which has nicer error messaging