Two (more) environment fixes #5837
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
kit-ty-kate
reviewed
Feb 15, 2024
There was a problem hiding this comment.
The manual might need to be updated. In particular, it says:
FOO += "",FOO := "", etc. are all ignored - i.e. opam never adds empty segments to an existing variable.
rjbou
reviewed
Feb 15, 2024
There was a problem hiding this comment.
It is missing a test for the case add an empty string to an undefined variable. Nothing changes in the environment as the variable is not defined beforehand.
diff --git a/tests/reftests/env.test b/tests/reftests/env.test
index 0a8a7a210..781341de3 100644
--- a/tests/reftests/env.test
+++ b/tests/reftests/env.test
@@ -80,6 +80,7 @@ setenv: [
[ NV_VARS3 := "" ]
[ NV_VARS3 := "foo" ]
[ NV_VARS4 = "" ]
+ [ NV_VARS5 += "" ] # undefined
]
flags: compiler
### opam switch create emptyvar nvAn update of the documentation to be more precise, and lgtm!
|
I think the manual’s correct, isn’t it? The issue was that opam wasn’t previously doing what it was supposed to (by any definition of |
If FOO=bar in the environment, the update FOO += "" will cause FOO to cease to be defined in the environment.
When applying environment updates, opam ensures that the final value only appears once in the list. This is done by looking at the keys in the list of updates and filtering out the values in the environment itself (the computation of the updates already takes into account existing values). The only problem is that FOO += "" will be filtered when the updates are applied, resulting in no value for FOO in the final environment _unless_ there was another update to it in the list. The fix is simply apply the updates first, and then compute the filtered keys afterwards.
Logical statement became accidentally inverted.
|
Thanks |
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.
Two fixes here, both relatively subtle:
FOO=bar, the updateFOO += ""would cause opam to execute withoutFOOin the environment