Clean repeated entries in PATH after vcvars call #3598
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
ghost
assigned 
jgsogo
suggested changes
Sep 22, 2018
conans/test/util/tools_test.py
Outdated
| for repeated in repeated_keys: | ||
| if previous_path.count(repeated) < 2: | ||
| # If the entry was already repeated before calling "tools.vcvars" we keep it | ||
| raise AssertionError("The key '%s' was not repeated previously but now it is" % repeated) |
There was a problem hiding this comment.
Use self.fail("....") instead.
conans/client/tools/win.py
Outdated
| tmp = value[:-(len(old_value) + 1)].split(os.pathsep) | ||
| if name_var.lower() == "path": | ||
| # vcvars doesn't look if previous paths are already set so clean the repeated to avoid | ||
| # max path (or any other list env var) len issues: |
There was a problem hiding this comment.
It can be just one line:
new_env[name_var] = {v.lower(): v for v in tmp}.values()
conans/test/util/tools_test.py
Outdated
| new_values.append(i) | ||
| else: | ||
| repeated_keys.append(i) | ||
|
|
There was a problem hiding this comment.
I'm not sure this is working as expected. We are appending a path (lowercase) variable to os.environ and then we are working with the PATH (uppercase) one. I think that I need here, at least, a self.assertTrue(len(repeated_keys) != 0) check.
There was a problem hiding this comment.
os.environ is not case sensitive.
|
Thanks for the review, I simplified a lot how it is doing the deduplication. |
jgsogo
approved these changes
Sep 24, 2018
danimtb
approved these changes
Sep 27, 2018
grisumbras
pushed a commit
to grisumbras/conan
that referenced
this pull request
Dec 27, 2018
* Clean repeated * only the path * fixed test * Simplified path dedup
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.
To clarify, there was no bug in Conan. vcvars prepends new variables to the PATH, but without looking if the entries in the path are or not already set with the same value there. With some recipes manipulating the environment, sometimes the max chars for PATHS is reached. So with this PR, the
vcvars_dictwill remove repeated entries in the PATH.Changelog: Feature: Clean repeated entries in the
PATHwhenvcvarsis run, mitigating the max size of the env var issues.