Allow empty-valued environment variables to be passed to non-MSYS programs#101
Merged
Merged
Conversation
There is a difference between an empty value and an unset environment variable. We should not confuse both; If the user wants to unset an environment variable, they can certainly do so (unsetenv(3), or in the shell: 'unset ABC'). This fixes Git's t3301-notes.sh, which overrides environment variables with empty values. Signed-off-by: Johannes Schindelin <[email protected]>
We just disabled the code that skips environment variables whose values are empty. However, this code was introduced a long time ago into Cygwin in d6b1ac7 (* environ.cc (build_env): Don't put an empty environment variable into the environment. Optimize use of "len". * errno.cc (ERROR_MORE_DATA): Translate to EMSGSIZE rather than EAGAIN., 2006-09-07), seemingly without any complaints. Meaning: There might very well be use cases out there where it makes sense to skip empty-valued environment variables. Therefore, it seems like a good idea to have a "knob" to turn it back on. With this commit, we introduce such a knob: by setting `noemptyenvvalues` the `MSYS` variable (or appending it if that variable is already set), users can tell the MSYS2 runtime to behave just like in the olden times. Signed-off-by: Johannes Schindelin <[email protected]>
With this commit, you can call MSYS=noemptyenvvalues my-command and it does what is expected: to pass no empty-valued environment variables to `my-command`. Signed-off-by: Johannes Schindelin <[email protected]>
dscho
force-pushed
the
allow-empty-env-values
branch
from
September 6, 2022 10:20
cab134e to
013b43a
Compare
dscho
marked this pull request as ready for review
September 6, 2022 11:57
lazka
approved these changes
Sep 19, 2022
Collaborator
Author
Why without the escape hatch? But yes, my answer is: yes, I think we should upstream this. |
Member
if no one knows why it was added and if there is no fallout in MSYS2 then it seems like unnecessary complexity. we'll see.... |
Collaborator
Author
Well, the original behavior (to treat environment variables with empty values as if they were deleted) hails from Cygwin, not from MSYS2... So they would know (or should know) why it was added. |
dscho
added a commit
to dscho/MSYS2-packages
that referenced
this pull request
Sep 20, 2022
This integrates the patches from msys2/msys2-runtime#102 and from msys2/msys2-runtime#101 Signed-off-by: Johannes Schindelin <[email protected]>
Member
|
There is some fallout from this, some fixable, some I don't understand yet. We currently have CPython in MSYS2 mode if "MSYSTEM" isn't set and in various examples we just do "MSYSTEM= python" because up until now this just happened to remove the env var I guess. That would be fixable by users by changing the code to $ unset MSYSTEM
$ env | grep MSYSTEM=
MSYSTEM=MINGW64So, the Python thing we can likely fix in MSYS2 by also recognizing an empty MSYSTEM env var in CPython -> msys2-contrib/cpython-mingw#107 Any ideas why unset doesn't work here? |
lazka
added a commit
to lazka/cpython
that referenced
this pull request
Sep 22, 2022
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched.
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Sep 23, 2022
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched.
Member
I'll open issues for anything else that comes up. |
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Oct 15, 2022
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched.
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Oct 15, 2022
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched.
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Dec 8, 2022
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched.
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Dec 9, 2022
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched.
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Jul 19, 2023
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Jul 19, 2023
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Aug 25, 2023
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Aug 27, 2023
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Oct 2, 2023
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Oct 2, 2023
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Dec 6, 2023
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Dec 7, 2023
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Jan 1, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Jan 1, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Jan 1, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Jan 1, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Jan 1, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Jan 1, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Jan 1, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Feb 10, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Feb 12, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Feb 19, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Feb 19, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Feb 19, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Feb 21, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Apr 11, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Apr 12, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Jul 11, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Aug 5, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Sep 4, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to naveen521kk/cpython
that referenced
this pull request
Sep 9, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
naveen521kk
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Sep 9, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
lazka
added a commit
to msys2-contrib/cpython-mingw
that referenced
this pull request
Sep 10, 2024
… one Up until now this didn't really happen when calling from cygwin because empty env vars were removed before Python would run. But msys2/msys2-runtime#101 changed that. To avoid breaking users that did something like MSYSTEM= python ... not only check that MSYSTEM isn't set but also that it isn't empty when deciding if os.sep/os.altsep should be switched. Also, guard the msystem env check to execute only on MINGW Co-authored-by: Naveen M K <[email protected]>
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
2 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.
This addresses #99 and also reduces the difference between the MSYS2 runtime and Git for Windows' fork of the same.