Skip to content

Commit

Permalink
Added touch statements to artifacts and content units where cleanup n…
Browse files Browse the repository at this point in the history
…eeds to be prevented.

closes #9151
  • Loading branch information
ipanova authored and dralley committed Aug 3, 2021
1 parent 3a1878c commit 59ef64e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGES/9151.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Comply with orphan clean up changes introduced in pulpcore 3.15
2 changes: 2 additions & 0 deletions pulp_rpm/app/advisory.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def resolve_advisories(version, previous_version):
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)
added_advisory.touch()
to_add, to_remove, to_exclude = resolve_advisory_conflict(
previous_advisory, added_advisory
)
Expand Down Expand Up @@ -333,6 +334,7 @@ def merge_advisories(previous_advisory, added_advisory):
merged_advisory.save()
except IntegrityError:
merged_advisory = UpdateRecord.objects.get(digest=merged_digest)
merged_advisory.touch()
else:
# For UpdateCollections, make sure we don't re-use the collections for either of the
# advisories being merged
Expand Down
1 change: 1 addition & 0 deletions pulp_rpm/app/serializers/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ def deferred_validate(self, data):
["=".join(item) for item in new_pkg.items() if item[0] in keywords]
)

package.get().touch()
raise serializers.ValidationError(
_("There is already a package with: {values}.").format(values=error_data)
)
Expand Down

0 comments on commit 59ef64e

Please sign in to comment.