Skip removing FIFOs from device #528
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
|
Thanks for the PR and sorry for the delay. I'll try to check this out sometime early this week. |
That operation always fails with error `0xc` anyway. To distinguish regular files from FIFO, new `READ_DIR_FIFO` is added to `read_dir_cb_reason`. The behavior of other operations regarding FIFOs is left the same by supporting the new reason. Another implementation could be not to extend the `read_dir_cb_reason` and add another flag to `read_dir`'s `callback`, but that would allow meaningless cases, such as `reason = READ_DIR_AFTER_DIR, is_fifo = true`. The ideal implementation would be to extent the `READ_DIR_FILE` enum case with a flag (i.e., `READ_DIR_FILE(is_fifo = true)`), but that is not supported in Objective-C.
eunikolsky
force-pushed
the
fix/skip_removing_fifo
branch
2 times, most recently
from
ffe3c40 to
2c4db43
Compare
The fix is to skip removing FIFOs had a side-effect of failing to remove
a directory where a skipped file is because the directory is not empty.
The change here is to continue removing files after errors, which is
also helpful in cases when `ios-deploy` fails to remove `/Documents/`
("Error 0xa: You do not have permission."), but still needs to continue
removing what it can from `/Library/`.
This makes `ios-deploy` print error messages for known error codes so that the console log looks like: ``` ios-deploy[13450:4855044] [ !! ] Error 0x1: An unknown error occurred. AFCRemovePath(conn, name) ios-deploy[13450:4855044] [ !! ] Error 0xa: You do not have permission. AFCRemovePath(conn, name) ``` instead of: ``` ios-deploy[13409:4853438] [ !! ] Error 0x1: unknown. AFCRemovePath(conn, name) ios-deploy[13409:4853438] [ !! ] Error 0xa: unknown. AFCRemovePath(conn, name) ``` The fix is to create an error code from the input `error` to match what's defined in `errorcode_to_id` (for some reason, the errors are `OR`'d with `0xe8000000`). This change is taken from the `SDMMobileDevice` project, which is the source for the error codes.
eunikolsky
force-pushed
the
fix/skip_removing_fifo
branch
from
2c4db43 to
e5915d2
Compare
|
Rebased the branch onto latest |
|
We ran into the same issue where rmtree stops after permissions error and this PR fixes our usage. Thanks! |
|
This makes sense, I don't have time to actually test this on real devices but I think it's better to get this merged since it's a real-world issue. |
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.
That operation always fails with error
0xcanyway.To distinguish regular files from FIFO, new
READ_DIR_FIFOis added toread_dir_cb_reason. The behavior of other operations regarding FIFOsis left the same by supporting the new reason.
(Another implementation could be not to extend the
read_dir_cb_reasonand add another flag to
read_dir'scallback, but that would allowmeaningless cases, such as
reason = READ_DIR_AFTER_DIR, is_fifo = true.The ideal implementation would be to extent the
READ_DIR_FILEenumcase with a flag (i.e.,
READ_DIR_FILE(is_fifo = true)), but that isnot supported in Objective-C.)
The fix is to skip removing FIFOs had a side-effect of failing to remove
a directory where a skipped file is because the directory is not empty.
The change here is to continue removing files after errors, which is
also helpful in cases when
ios-deployfails to remove/Documents/("Error 0xa: You do not have permission."), but still needs to continue
removing what it can from
/Library/.Fixes #518.
Error messages
I've also stumbled upon a fix for error messages (I can extract it to a new PR if necessary):
This makes
ios-deployprint error messages for known error codes sothat the console log looks like:
instead of:
The fix is to create an error code from the input
errorto matchwhat's defined in
errorcode_to_id(for some reason, the errors areOR'd with0xe8000000). This change is taken from theSDMMobileDeviceproject, which is the source for the error codes.Sample output now