Don't attempt to re-import broken files if they didn't change #94357
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
akien-mga
approved these changes
Jul 17, 2024
|
Thanks! |
|
Does this also fix #90980? |
Tested, seems so. |
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.
Fixes #62271
_reimport_file()had code that was able to handle invalid imports (it even explicitly writesvalid=falseto file), but that code was unused, because the method failed early in case of error. This PR moves the fail line to the bottom of the method, so user is notified about failed import, but the.importfile and modified times are written normally.Moreover, I removed code that attempts to re-import when
.importfile is invalid. This is no longer necessary after #84974. Reimport will be automatically attempted if.importfile has changed, so no reason to force it when the file will stay invalid anyway (see above case).