Fix regression on windows: Env var names are case insensitive #1501
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
tmp64
reviewed
Sep 27, 2024
src/vcpkg/base/system.process.cpp
Outdated
| @@ -661,8 +661,9 @@ namespace vcpkg | |||
| { | |||
| auto pos = env_var.find('='); | |||
| auto key = env_var.substr(0, pos); | |||
| if (Util::Sets::contains(env_strings, key) || | |||
| Util::any_of(env_prefix_string, [&](auto&& group) { return Strings::starts_with(key, group); })) | |||
| if (Util::Sets::contains(env_strings, key) || Util::any_of(env_prefix_string, [&](auto&& group) { | |||
There was a problem hiding this comment.
Is Util::Sets::contains case-insensitive? SystemRoot is in env_strings
There was a problem hiding this comment.
Good catch. It too late for me 😅 Will fix that :)
|
Since this blew up in an important way, can you add a test? |
3 tasks
|
Seems to fix microsoft/vcpkg#41235 |
|
Thanks for the superb diagnostics @tmp64 and the fix @autoantwort |
ihnorton
added a commit
to TileDB-Inc/TileDB
that referenced
this pull request
Sep 30, 2024
Fix rtools40 build. vcpkg-tool released a change which no longer treated environment variables as case-insensitive, then removed the variables -- breaking tools which depend on those variables. Explanation: microsoft/vcpkg#41199 (comment) x-ref: ``` - microsoft/vcpkg-tool#1501 - via cameleon-rs/cameleon#193 - via microsoft/vcpkg#41154 ``` --- TYPE: NO_HISTORY DESC: Fix rtools40 build.
vszakats
pushed a commit
to curl/curl
that referenced
this pull request
Oct 3, 2024
Fixes: ``` error: https://github.com/google/brotli/archive/v1.1.0.tar.gz: WinHttpSendRequest failed with exit code 10106 ``` Apply workaround: microsoft/vcpkg#41199 (comment) Bug commit: microsoft/vcpkg-tool@d3fc357#diff-33cf7c311a76d4a838f91b078c2f8cbc984557379f7b345a268ec6deb665a91eR666-R675 Fix commit: microsoft/vcpkg-tool@3122da7 Fix PR: microsoft/vcpkg-tool#1501 Fixes #15128 Reported-by: Viktor Szakats Closes #15133
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.
Fixes microsoft/vcpkg#41199
Thank you @tmp64 for identifying why the problem exists :)
The old code was also case insensitive, because
get_environment_variableis case insensitive