Skip to content

[bugs]: add other sysinfos, but respect existing ca paths #1315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Jul 26, 2023
Merged

[bugs]: add other sysinfos, but respect existing ca paths #1315

merged 2 commits into from
Jul 26, 2023

Conversation

ipince
Copy link
Contributor

@ipince ipince commented Jul 26, 2023

Summary

This should fix the two remaining bugs in the lockfile merging logic:

  1. If we have new system infos for a system that is not our own, add them anyway.
  2. If we have a system info whose StorePath does not match the existing info's StorePath, then replace the info. This is to ensure correctness--all infos should come from the same resolved package version.

How was it tested?

Added unit tests!

@ipince ipince requested a review from savil July 26, 2023 18:22
savil
savil approved these changes Jul 26, 2023
View reviewed changes
Copy link
Collaborator

@savil savil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awesome!

@ipince ipince merged commit 7ab2d35 into main Jul 26, 2023
@ipince ipince deleted the rodrigo/lockfile-merge-bugs branch July 26, 2023 19:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@savil savil savil approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ipince @savil