From 97e705403fb981113a79ee4c5bd592f50ef3283f Mon Sep 17 00:00:00 2001 From: Fabricio Aguiar Date: Wed, 6 Jan 2021 15:21:10 -0300 Subject: [PATCH] Fix is_highest logic https://pulp.plan.io/issues/8039 closes #8039 --- CHANGES/8039.bugfix | 1 + pulp_ansible/app/tasks/collections.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 CHANGES/8039.bugfix diff --git a/CHANGES/8039.bugfix b/CHANGES/8039.bugfix new file mode 100644 index 000000000..74df905d8 --- /dev/null +++ b/CHANGES/8039.bugfix @@ -0,0 +1 @@ +Fix collection version comparison on re-syncs diff --git a/pulp_ansible/app/tasks/collections.py b/pulp_ansible/app/tasks/collections.py index e3279e6af..0fff11901 100644 --- a/pulp_ansible/app/tasks/collections.py +++ b/pulp_ansible/app/tasks/collections.py @@ -246,6 +246,10 @@ def _update_highest_version(collection_version): last_highest.save() collection_version.save() + elif collection_version.is_highest and collection_version.version != last_highest.version: + collection_version.is_highest = False + collection_version.save() + class AnsibleDeclarativeVersion(DeclarativeVersion): """ @@ -600,7 +604,8 @@ async def _post_save(self, batch): continue collection_version = d_content.content docs_blob = d_content.extra_data.get("docs_blob", {}) - collection_version.docs_blob = docs_blob + if docs_blob: + collection_version.docs_blob = docs_blob for d_artifact in d_content.d_artifacts: artifact = d_artifact.artifact