Skip to content
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

Two (more) environment fixes #5837

Merged
merged 3 commits into from
Feb 16, 2024
Merged

Two (more) environment fixes #5837

merged 3 commits into from
Feb 16, 2024

Commits on Feb 16, 2024

  1. Show empty environment updates occlude env value 

    If FOO=bar in the environment, the update FOO += "" will cause FOO to
cease to be defined in the environment.
    @dra27 @rjbou
    dra27 authored and rjbou committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    6504769 View commit details
    Browse the repository at this point in the history

  2. Fix deduplication when applying env updates 

    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.
    @dra27 @rjbou
    dra27 authored and rjbou committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    40317ab View commit details
    Browse the repository at this point in the history

  3. Fix error from ocaml#5356 

    Logical statement became accidentally inverted.
    @dra27 @rjbou
    dra27 authored and rjbou committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    e789b2e View commit details
    Browse the repository at this point in the history