Fix empty updates in dynamic init scripts#6198
Merged
kit-ty-kate merged 2 commits intoocaml:masterfrom Apr 8, 2025
Merged
Conversation
aa87369 to
a35a1e6
Compare
kit-ty-kate
reviewed
Sep 23, 2024
Member
kit-ty-kate
left a comment
There was a problem hiding this comment.
modulo the fixup commit i've just pushed (feel free to remove it or squash it if you disagree or agree with it), that looks ok to me, although i'm not an expert in this part of the code.
Could you add a test in the reftests to avoid future regressions? From afar it looks reasonably easy to craft a test for this particular case
4c19c6f to
6aa765f
Compare
kit-ty-kate
approved these changes
Apr 7, 2025
Member
kit-ty-kate
left a comment
There was a problem hiding this comment.
I added a test showing the behaviour and rebased the branch. LGTM
Collaborator
|
rjbou
approved these changes
Apr 8, 2025
rjbou
reviewed
Apr 8, 2025
…ngs on variables.sh
opam already ensured that empty segments are never added to environment variables with opam env, but the filter was not there for writing the dynamic init scripts.
6aa765f to
25952f7
Compare
Member
|
Thanks! |
This was referenced Apr 8, 2025
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
3 participants
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.
An update of the form:
is not supposed to do anything to the environment (#5350). However, these updates were being written to the init scripts in opam-init (
variables.sh, etc.). This PR fixes that, and consequently the problem with mingw-w64-shims reported in dra27/mingw-w64-shims#2 and #6053 (comment).Before this PR, for a switch with mingw-w64-shims and only the x86_64 installation, variables.sh has:
which is wrong, but after just:
Both before and after, the switch's
environmentfile correctly has both entries: