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

Populate 'requires' returned by server's search enpoint #6861

Merged
merged 1 commit into from Apr 15, 2020

Conversation

jgsogo
Copy link
Member

@jgsogo jgsogo commented Apr 15, 2020

Changelog: Fix: Populate requires returned by the servers from the search endpoint using requires (Artifactory) or full_requires (conan_server) fields.
Docs: omit

Closes #6859
Close #6879

We cannot change conan_server implementation (breaking) and we cannot change Artifactory to return full_requires field

@@ -877,10 +877,12 @@ def search_packages(self, reference, query=None, remote_name=None, outdated=Fals
if remote_ref.ordered_packages:
for package_id, properties in remote_ref.ordered_packages.items():
package_recipe_hash = properties.get("recipe_hash", None)
# Artifactory uses field 'requires', conan_center 'full_requires'
requires = properties.get("requires", []) or properties.get("full_requires", [])
Copy link
Member

@memsharded memsharded Apr 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, but knowing that requires is the zlib/1.X.Y converted version, used for the package_id hash. This probably requires normalization in the server side too?

Copy link
Member Author

@jgsogo jgsogo Apr 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

requires from Artifactory contains the full package reference (there is no full_requires field), Conan Server full_requires contain the full package reference (there is no requires field).

Copy link
Member

@memsharded memsharded Apr 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh! Ok then.

@jgsogo jgsogo added this to the 1.25 milestone Apr 15, 2020
@czoido czoido merged commit eea9621 into conan-io:develop Apr 15, 2020
2 checks passed
@jgsogo jgsogo deleted the fix/search-artifactory branch Apr 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants