Use os.path.relpath instead of lstrip in wifi.py #277
Conversation
This file contains 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
Using lstrip sometimes broken the folder names in wifi folder by removing
the "C" in the relpath.
A code similar to the following was added to debug:
if props:
log.error(f"Unhandled properties found: {props} in file {relpath}")
assert not props
and the result was:
Unhandled properties found: {'': '4355'} in file -4355__s-C1/P-hawaii-ID_M-YSBC_V-m__m-2.3.txt
Traceback (most recent call last):
File "/home/aditya/firmware.sh", line 905, in <module>
wifi_col = WiFiFWCollection(sys.argv[1]+"/wifi")
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/aditya/firmware.sh", line 737, in __init__
self.load(source_path)
File "/home/aditya/firmware.sh", line 776, in load
assert not props
AssertionError
Signed-off-by: Aditya Garg <gargaditya08@live.com>
|
Although the issue is something that happens once in a blue moon, probably because I use temporary directories to rename firmware on Linux, extracted from macOS Recovery Images. |
|
I found a way to reproduce the issue. If a folder in the source_path has a "C" in its name, the error is seen: |
|
After the change in this PR, the bug seems to be fixed. |
AdityaGarg8
changed the title
|
BTW, on macOS Sonoma, the wifi.py always failed for me ever since macOS Sonoma has been released. I got this log from there today: Currently as a workaround I am making the script extract firmware for my model only. |
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.
No description provided.