Auto-heal on corrupted lockfile with missing deps #6400
Merged
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
composerinteralia
force-pushed
the
auto-heal-corrupted-lockfile
branch
3 times, most recently
from
0234ac7
to
f7ab4da
Compare
Following up on rubygems#6355, which turned a crash into a nicer error message, this commit auto-heals the corrupt lockfile instead. In this particular case (a corrupt Gemfile.lock with missing dependencies) the LazySpecification will not have accurate dependency information, we have to materialize the SpecSet to determine there are missing dependencies. We've already got a way to handle this, via `SpecSet#incomplete_specs`, but it wasn't quite working for this case because we'd get to `@incomplete_specs += lookup[name]` and `lookup[name]` would be empty for the dependency. With this commit we catch it a bit earlier, marking the parent spec containing the missing dependency as incomplete.
composerinteralia
force-pushed
the
auto-heal-corrupted-lockfile
branch
from
f7ab4da
to
486ecb8
Compare
deivid-rodriguez
approved these changes
Feb 28, 2023
4 tasks
simi
approved these changes
Feb 28, 2023
4 tasks
deivid-rodriguez
pushed a commit
that referenced
this pull request
Mar 8, 2023
…ockfile Auto-heal on corrupted lockfile with missing deps (cherry picked from commit 6e38d37)
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.
What was the end-user or developer problem that led to this PR?
See #6355 for the original problem.
What is your fix for the problem, implemented in this PR?
#6355 turned a crash into a nicer error. This commit auto-heals the corrupt lockfile instead.
In this particular case (a corrupt Gemfile.lock with missing dependencies) the LazySpecification will not have accurate dependency information, so we have to materialize the SpecSet to determine there are missing dependencies. We've already got a way to handle this, via
SpecSet#incomplete_specs, but it wasn't quite working for this case because we'd get to@incomplete_specs += lookup[name]andlookup[name]would be empty for the dependency.With this commit we catch it a bit earlier, marking the spec containing the missing dependency as incomplete.
(I had originally opened #6399, but misunderstood a few things there. I closed it and then force pushed to the branch, preventing me from reopening it.)
Make sure the following tasks are checked