Skip to content

Commit 51ccb37

Browse files
committed
Support pulpcore 3.107's atomic distribution feature
1 parent d23d9df commit 51ccb37

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Support "atomic" replications in pulpcore 3.107

pulp_container/app/replica.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from pulpcore.plugin.replica import Replicator
2-
from pulpcore.plugin.util import get_url
32

43
from pulp_glue.container.context import (
54
PulpContainerDistributionContext,
@@ -42,12 +41,11 @@ def distribution_extra_fields(self, repository, upstream_distribution):
4241
"""
4342
Return the fields that need to be updated/cleared on distributions for idempotence.
4443
"""
45-
return {
46-
"repository": get_url(repository),
47-
"base_path": upstream_distribution["base_path"],
48-
"private": upstream_distribution["private"],
49-
"description": upstream_distribution["description"],
50-
}
44+
fields = super().distribution_extra_fields(repository, upstream_distribution)
45+
fields.pop("publication")
46+
fields["private"] = upstream_distribution["private"]
47+
fields["description"] = upstream_distribution["description"]
48+
return fields
5149

5250

5351
REPLICATION_ORDER = [ContainerReplicator]

0 commit comments

Comments
 (0)