Merge branch 'bugfix/ldgen_section_windows_line_ending' into 'master'

tools/ldgen: Fix parsing of section names on Windows

See merge request espressif/esp-idf!10988
pull/4512/merge
Ivan Grokhotkov 2020-10-29 15:25:11 +08:00
commit d13455e6fc
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -581,8 +581,8 @@ class SectionsInfo(dict):
archive_path = (Literal("In archive").suppress() +
White().suppress() +
# trim the last character (:) from archive_path
restOfLine.setResultsName("archive_path").setParseAction(lambda t: t[0][:-1]))
# trim the colon and line ending characters from archive_path
restOfLine.setResultsName("archive_path").setParseAction(lambda s, loc, toks: s.rstrip(":\n\r ")))
parser = archive_path
results = None