Fix credentials being re-added when re-resolving without a full unlock #7767
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
4 tasks
deivid-rodriguez
added a commit
that referenced
this pull request
Jun 20, 2024
…als-take-2 Fix credentials being readded when re-resolving without a full unlock (cherry picked from commit 9c022dc)
deivid-rodriguez
changed the title
|
Running |
|
Hi @wlokes, thanks for letting me know. I did some testing and I was not able to reproduce. Are you sure you used the latest version of Bundler? |
|
Hi David,
Thank you for the follow up. I am on the latest version, but I was using a
terminal in my IDE and I think that caused some weird behavior. If I use a
standalone terminal, it works fine. Sorry for the false alarm.
…On Tue, Jul 2, 2024 at 11:29 AM David Rodríguez ***@***.***> wrote:
Hi @wlokes <https://github.com/wlokes>, thanks for letting me know. I did
some testing and I was not able to reproduce. Are you sure you used the
latest version of Bundler?
—
Reply to this email directly, view it on GitHub
<#7767 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAXARSUD5BUL2O345LZFINDZKLBN7AVCNFSM6AAAAABJP3ZGF2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEMBTGUZTINBQHE>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
No problem, let me know if you run into more issues! |
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?
I tried to implement a more stable behavior for locking credentials in #7720, but I missed one case.
The problem is that in the "re-resolve without full unlock" case, the
Source::Rubygems#remotes=setter is called twice, so original lockfile credentials are lost.What is your fix for the problem, implemented in this PR?
My fix is to set original credentials only when parsing the lockfile initially, not every time sources are replaced, so that they are never overwritten.
Fixes #7761.
Make sure the following tasks are checked