stub: avoid copying admin users onto itself - #437
Open
princeramanii wants to merge 1 commit into
Open
Conversation
When the installer runs from the stub recoveryOS, cur_os may refer to the same Preboot volume as the repair target. shutil.copy then raises SameFileError and aborts the repair. Skip the copy when both paths refer to the same file. Keep metadata collection and immutable flag handling unchanged. Closes: AsahiLinux#353 Closes: AsahiLinux#420 Signed-off-by: Prince Ramani <139647088+princeramanii@users.noreply.github.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
When the installer runs from the stub recoveryOS, the current OS and repair target can refer to the same Preboot volume. Copying AdminUserRecoveryInfo.plist then raises SameFileError and aborts the repair.
Skip the copy when both paths refer to the same file, while continuing to collect the admin metadata and restore the immutable flag. The normal repair path still copies updated owner credentials from a different source.
The two regression tests cover both cases and run in the existing build workflow.
Tested with: python3 -m unittest discover -s tests -v
Closes #353
Closes #420