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.

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

Feature/message alias overridden #3456

Merged

Conversation

Projects
None yet
3 participants
@memsharded
Copy link
Contributor

commented Sep 1, 2018

Close #3353

Changelog: Fix: Removed bad duplicated messages about dependency overriding when using conan alias.

@ghost ghost assigned memsharded Sep 1, 2018

@ghost ghost added the stage: review label Sep 1, 2018

@memsharded memsharded added this to the 1.8 milestone Sep 1, 2018

@memsharded memsharded removed their assignment Sep 1, 2018

@@ -76,7 +78,7 @@ def _load_deps(self, node, down_reqs, dep_graph, public_deps, down_ref, down_opt
param down_ref: ConanFileReference of who is depending on current node for this expansion
"""
# basic node configuration
new_reqs, new_options = self._config_node(node, down_reqs, down_ref, down_options)
new_reqs, new_options = self._config_node(node, down_reqs, down_ref, down_options, aliased)

self._resolve_deps(node, aliased, update, remote_name)

This comment has been minimized.

Copy link
@jgsogo

jgsogo Sep 22, 2018

Member

If _config_node performs the alias substitution, then it is no longer needed in _resolve_deps.

This comment has been minimized.

Copy link
@memsharded

memsharded Sep 23, 2018

Author Contributor

Yes, it is necessary, because _resolve_deps needs to check for alias AFTER the range has been resolved.

This comment has been minimized.

Copy link
@jgsogo

jgsogo Sep 24, 2018

Member

And the work done in _config_node does not require version ranges to be already resolved?

This comment has been minimized.

Copy link
@memsharded

memsharded Sep 24, 2018

Author Contributor

Not necessary, this applies to normal requires that are aliased.
However, you are right, I need to review this, maybe could be improved, it is complicated the deps resolution...
Please wait until I can check it.

This comment has been minimized.

Copy link
@memsharded

memsharded Oct 8, 2018

Author Contributor

I have tried a few things, and tests are broken. Leaving it as-is.

@ghost ghost assigned memsharded Sep 23, 2018

@memsharded memsharded force-pushed the memsharded:feature/message_alias_overridden branch from 95c7c8c to c990abf Oct 7, 2018

@jgsogo

jgsogo approved these changes Oct 8, 2018

@lasote lasote merged commit bca4d24 into conan-io:develop Oct 8, 2018

2 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
license/cla Contributor License Agreement is signed.
Details

@ghost ghost removed the stage: review label Oct 8, 2018

@memsharded memsharded deleted the memsharded:feature/message_alias_overridden branch Oct 8, 2018

grisumbras pushed a commit to grisumbras/conan that referenced this pull request Dec 27, 2018

Feature/message alias overridden (conan-io#3456)
* resolve alias earlier so they are not overridden

* minor style
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.