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.

Sign up for GitHub

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

Jump to bottom

Advisory conflict resolution #1583

Merged
merged 1 commit into from
Feb 11, 2020
Merged

Advisory conflict resolution #1583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGES/5924.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix advisory conflict resolution to check current version first.
24 changes: 15 additions & 9 deletions pulp_rpm/app/advisory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ def resolve_advisories(version, previous_version):
pk__in=version.content.filter(pulp_type="rpm.advisory"))
added_advisories = current_advisories
advisory_conflicts = []
if previous_version:
# check for IDs if any conflict
# e.g. mirror mode can already removed advisories with same ID
current_ids = [adv.id for adv in current_advisories]

if previous_version and len(current_ids) != len(set(current_ids)):
previous_advisories = UpdateRecord.objects.filter(
pk__in=previous_version.content.filter(pulp_type="rpm.advisory"))
previous_advisory_ids = set(previous_advisories.values_list('id', flat=True))
Expand All @@ -53,14 +57,16 @@ def resolve_advisories(version, previous_version):
added_advisory_ids = set(adv.id for adv in added_advisories)
advisory_conflicts = added_advisory_ids.intersection(previous_advisory_ids)

added_advisory_pks = [adv.pk for adv in added_advisories]
for advisory_id in advisory_conflicts:
previous_advisory = previous_advisories.get(id=advisory_id)
added_advisory = UpdateRecord.objects.get(id=advisory_id, pk__in=added_advisory_pks)
to_add, to_remove, to_exclude = resolve_advisory_conflict(previous_advisory, added_advisory)
content_pks_to_add.update(to_add)
content_pks_to_remove.update(to_remove)
content_pks_to_exclude.update(to_exclude)
added_advisory_pks = [adv.pk for adv in added_advisories]
for advisory_id in advisory_conflicts:
previous_advisory = previous_advisories.get(id=advisory_id)
added_advisory = UpdateRecord.objects.get(id=advisory_id, pk__in=added_advisory_pks)
to_add, to_remove, to_exclude = resolve_advisory_conflict(
previous_advisory, added_advisory
)
content_pks_to_add.update(to_add)
content_pks_to_remove.update(to_remove)
content_pks_to_exclude.update(to_exclude)

if content_pks_to_add:
version.add_content(Content.objects.filter(pk__in=content_pks_to_add))
Expand Down