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

Changes needed for override warn #17822

Draft
wants to merge 1 commit into
base: develop2
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions conan/cli/printers/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ def _format_resolved(title, reqs_to_print):
output.info("Overrides", Color.BRIGHT_YELLOW)
for req, override_info in overrides.serialize().items():
output.info(" {}: {}".format(req, override_info), Color.BRIGHT_CYAN)
if override_info == [None]:
output.warning("Unused override")

if deprecated:
output.info("Deprecated", Color.BRIGHT_YELLOW)
Expand Down
14 changes: 6 additions & 8 deletions conans/client/graph/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,19 +313,17 @@ def create(nodes):
overrides = {}
for n in nodes:
for r in n.conanfile.requires.values():
if r.override and not r.overriden_ref: # overrides are not real graph edges
continue
if r.overriden_ref:
overrides.setdefault(r.overriden_ref, set()).add(r.override_ref)
else:
overrides.setdefault(r.ref, set()).add(None)
if r.override:
if r.overriden_ref:
overrides.setdefault(r.overriden_ref, set()).add(r.override_ref)
else:
overrides.setdefault(r.ref, set()).add(None)

# reduce, eliminate those overrides definitions that only override to None, that is, not
# really an override
result = Overrides()
for require, override_info in overrides.items():
if len(override_info) != 1 or None not in override_info:
result._overrides[require] = override_info
result._overrides[require] = override_info
return result

def get(self, require):
Expand Down
5 changes: 5 additions & 0 deletions test/integration/graph/require_override_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,8 @@ def test_can_override_even_versions_with_build_metadata(self):
c.assert_listed_require({"lib/1.0+xyz": "Cache",
"pkg/1.0": "Cache"})

def test_discarded_override(self):
tc = TestClient(light=True)
tc.save({"conanfile.py": GenConanfile("lib").with_requirement("pkg/1.0", override=True)})
tc.run("graph info .")
assert "Unused override" in tc.out
Loading