pulpcore 3.76.0__tar.gz → 3.77.0__tar.gz

{pulpcore-3.76.0 → pulpcore-3.77.0}/CHANGES.md

@@ -8,6 +8,80 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.77.0 (2025-05-06) {: #3.77.0 }
+
+### REST API {: #3.77.0-rest-api }
+
+#### Features {: #3.77.0-rest-api-feature }
+
+- The `TASK_DIAGNOSTICS` option now permits individual diagnostics to be enabled or disabled by listing them.
+  [#4548](https://github.com/pulp/pulpcore/issues/4548)
+- If enabled using `TASK_DIAGNOSTICS` and the appropriate package is installed, tasks can now output a profile of what functions / lines allocated the most memory at the time of peak RSS.
+
+#### Bugfixes {: #3.77.0-rest-api-bugfix }
+
+- Fixed a memory consumption issue that was triggered by the use of the Alternate Content Source feature.
+  [#6500](https://github.com/pulp/pulpcore/issues/6500)
+- Fixed incorrect use of f-strings in gettext.
+  [#6521](https://github.com/pulp/pulpcore/issues/6521)
+
+#### Improved Documentation {: #3.77.0-rest-api-doc }
+
+- Fixed the TASK_DIAGNOSTICS documentation, which was out of date.
+  [#6481](https://github.com/pulp/pulpcore/issues/6481)
+
+#### Misc {: #3.77.0-rest-api-misc }
+
+- 
+
+### Plugin API {: #3.77.0-plugin-api }
+
+#### Bugfixes {: #3.77.0-plugin-api-bugfix }
+
+- Re-added* timeout to tasks dispatched as immediate for both deferred and non-deferred runs.
+
+  Also, immediate tasks must be coroutines from now on.
+  This is to enable immediate tasks to run on the workers foreground without completely blocking heartbeats.
+  Support for legacy non-coroutines immediate task will be dropped in pulpcore 3.85.
+
+  \* This was added in pulpcore 3.75.0, reverted in 3.75.1 due to a regression and re-applied here with the regression fix.
+  [#6429](https://github.com/pulp/pulpcore/issues/6429)
+
+### Pulp File {: #3.77.0-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.77.0-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.76.1 (2025-04-24) {: #3.76.1 }
+
+### REST API {: #3.76.1-rest-api }
+
+#### Bugfixes {: #3.76.1-rest-api-bugfix }
+
+- Fixed a memory consumption issue that was triggered by the use of the Alternate Content Source feature.
+  [#6500](https://github.com/pulp/pulpcore/issues/6500)
+- Reverted fix for #6491, it broke certificate-chains.
+  [#6510](https://github.com/pulp/pulpcore/issues/6510)
+
+### Plugin API {: #3.76.1-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.76.1-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.76.1-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.76.0 (2025-04-22) {: #3.76.0 }
 
 ### REST API {: #3.76.0-rest-api }
@@ -51,6 +125,28 @@ No significant changes.
 
 ---
 
+## 3.75.3 (2025-04-22) {: #3.75.3 }
+
+### REST API {: #3.75.3-rest-api }
+
+No significant changes.
+
+### Plugin API {: #3.75.3-plugin-api }
+
+#### Bugfixes {: #3.75.3-plugin-api-bugfix }
+
+- Fixed `add_roles_for_object_creator` not handling anonymous users.
+
+### Pulp File {: #3.75.3-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.75.3-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.75.2 (2025-04-09) {: #3.75.2 }
 
 ### REST API {: #3.75.2-rest-api }
@@ -251,6 +347,98 @@ No significant changes.
 
 ---
 
+## 3.73.8 (2025-04-24) {: #3.73.8 }
+
+### REST API {: #3.73.8-rest-api }
+
+#### Bugfixes {: #3.73.8-rest-api-bugfix }
+
+- Reverted fix for #6491, it broke certificate-chains.
+  [#6510](https://github.com/pulp/pulpcore/issues/6510)
+
+### Plugin API {: #3.73.8-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.73.8-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.73.8-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.73.7 (2025-04-23) {: #3.73.7 }
+
+### REST API {: #3.73.7-rest-api }
+
+#### Bugfixes {: #3.73.7-rest-api-bugfix }
+
+- Fixed a memory consumption issue that was triggered by the use of the Alternate Content Source feature.
+  [#6500](https://github.com/pulp/pulpcore/issues/6500)
+
+### Plugin API {: #3.73.7-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.73.7-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.73.7-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.73.6 (2025-04-23) {: #3.73.6 }
+
+### REST API {: #3.73.6-rest-api }
+
+No significant changes.
+
+### Plugin API {: #3.73.6-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.73.6-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.73.6-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.73.5 (2025-04-22) {: #3.73.5 }
+
+### REST API {: #3.73.5-rest-api }
+
+#### Bugfixes {: #3.73.5-rest-api-bugfix }
+
+- Client- and CA-certificates used in Remotes are now validated and any comments stripped
+  before being applied to the Remote.
+  [#6491](https://github.com/pulp/pulpcore/issues/6491)
+
+### Plugin API {: #3.73.5-plugin-api }
+
+#### Bugfixes {: #3.73.5-plugin-api-bugfix }
+
+- Fixed `add_roles_for_object_creator` not handling anonymous users.
+
+### Pulp File {: #3.73.5-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.73.5-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.73.4 (2025-04-08) {: #3.73.4 }
 
 ### REST API {: #3.73.4-rest-api }
@@ -1050,6 +1238,78 @@ No significant changes.
 
 ---
 
+## 3.63.17 (2025-04-24) {: #3.63.17 }
+
+### REST API {: #3.63.17-rest-api }
+
+#### Bugfixes {: #3.63.17-rest-api-bugfix }
+
+- Reverted fix for #6491, it broke certificate-chains.
+  [#6510](https://github.com/pulp/pulpcore/issues/6510)
+
+### Plugin API {: #3.63.17-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.63.17-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.63.17-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.63.16 (2025-04-23) {: #3.63.16 }
+
+### REST API {: #3.63.16-rest-api }
+
+#### Bugfixes {: #3.63.16-rest-api-bugfix }
+
+- Fixed a memory consumption issue that was triggered by the use of the Alternate Content Source feature.
+  [#6500](https://github.com/pulp/pulpcore/issues/6500)
+
+### Plugin API {: #3.63.16-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.63.16-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.63.16-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.63.15 (2025-04-22) {: #3.63.15 }
+
+### REST API {: #3.63.15-rest-api }
+
+#### Bugfixes {: #3.63.15-rest-api-bugfix }
+
+- Client- and CA-certificates used in Remotes are now validated and any comments stripped
+  before being applied to the Remote.
+  [#6491](https://github.com/pulp/pulpcore/issues/6491)
+
+### Plugin API {: #3.63.15-plugin-api }
+
+#### Bugfixes {: #3.63.15-plugin-api-bugfix }
+
+- Fixed `add_roles_for_object_creator` not handling anonymous users.
+
+### Pulp File {: #3.63.15-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.63.15-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.63.14 (2025-04-08) {: #3.63.14 }
 
 ### REST API {: #3.63.14-rest-api }
@@ -2218,6 +2478,76 @@ No significant changes.
 
 ---
 
+## 3.49.39 (2025-04-24) {: #3.49.39 }
+
+### REST API {: #3.49.39-rest-api }
+
+#### Bugfixes {: #3.49.39-rest-api-bugfix }
+
+- Reverted fix for #6491, it broke certificate-chains.
+  [#6510](https://github.com/pulp/pulpcore/issues/6510)
+
+### Plugin API {: #3.49.39-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.49.39-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.49.39-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.49.38 (2025-04-23) {: #3.49.38 }
+
+### REST API {: #3.49.38-rest-api }
+
+#### Bugfixes {: #3.49.38-rest-api-bugfix }
+
+- Fixed a memory consumption issue that was triggered by the use of the Alternate Content Source feature.
+  [#6500](https://github.com/pulp/pulpcore/issues/6500)
+
+### Plugin API {: #3.49.38-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.49.38-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.49.38-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.49.37 (2025-04-22) {: #3.49.37 }
+
+### REST API {: #3.49.37-rest-api }
+
+#### Bugfixes {: #3.49.37-rest-api-bugfix }
+
+- Client- and CA-certificates used in Remotes are now validated and any comments stripped
+  before being applied to the Remote.
+  [#6491](https://github.com/pulp/pulpcore/issues/6491)
+
+### Plugin API {: #3.49.37-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.49.37-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.49.37-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.49.36 (2025-04-08) {: #3.49.36 }
 
 ### REST API {: #3.49.36-rest-api }
@@ -3653,6 +3983,52 @@ No significant changes.
 -   Starting from this release pulp_file will be shipped as part of the pulpcore package.
     [#4550](https://github.com/pulp/pulpcore/issues/4550)
 
+## 3.39.30 (2025-04-24) {: #3.39.30 }
+
+### REST API {: #3.39.30-rest-api }
+
+#### Bugfixes {: #3.39.30-rest-api-bugfix }
+
+- Reverted fix for #6491, it broke certificate-chains.
+  [#6510](https://github.com/pulp/pulpcore/issues/6510)
+
+### Plugin API {: #3.39.30-plugin-api }
+
+No significant changes.
+
+---
+
+## 3.39.29 (2025-04-23) {: #3.39.29 }
+
+### REST API {: #3.39.29-rest-api }
+
+#### Bugfixes {: #3.39.29-rest-api-bugfix }
+
+- Fixed a memory consumption issue that was triggered by the use of the Alternate Content Source feature.
+  [#6500](https://github.com/pulp/pulpcore/issues/6500)
+
+### Plugin API {: #3.39.29-plugin-api }
+
+No significant changes.
+
+---
+
+## 3.39.28 (2025-04-22) {: #3.39.28 }
+
+### REST API {: #3.39.28-rest-api }
+
+#### Bugfixes {: #3.39.28-rest-api-bugfix }
+
+- Client- and CA-certificates used in Remotes are now validated and any comments stripped
+  before being applied to the Remote.
+  [#6491](https://github.com/pulp/pulpcore/issues/6491)
+
+### Plugin API {: #3.39.28-plugin-api }
+
+No significant changes.
+
+---
+
 ## 3.39.27 (2025-04-02) {: #3.39.27 }
 
 ### REST API {: #3.39.27-rest-api }

{pulpcore-3.76.0 → pulpcore-3.77.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.76.0
+Version: 3.77.0
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org
@@ -21,14 +21,14 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiodns<=3.2.0,>=3.0
+Requires-Dist: aiodns<=3.3.0,>=3.0
 Requires-Dist: aiofiles<24.2.0,>=22.1
 Requires-Dist: aiohttp<3.12,>=3.8.1
 Requires-Dist: asyncio-throttle<=1.0.2,>=1.0
 Requires-Dist: async-timeout<4.0.4,>=4.0.3; python_version < "3.11"
 Requires-Dist: backoff<2.2.2,>=2.1.2
 Requires-Dist: click<=8.1.8,>=8.1.0
-Requires-Dist: cryptography<44.0.3,>=38.0.1
+Requires-Dist: cryptography<44.0.4,>=38.0.1
 Requires-Dist: Django~=4.2.0
 Requires-Dist: django-filter<=25.1,>=23.1
 Requires-Dist: django-guid<=3.5.1,>=3.3
@@ -52,13 +52,13 @@ Requires-Dist: opentelemetry-exporter-otlp-proto-http<1.33,>=1.27.0
 Requires-Dist: protobuf<6.0,>=4.21.1
 Requires-Dist: pulp-glue<0.33,>=0.18.0
 Requires-Dist: pygtrie<=2.5.0,>=2.5
-Requires-Dist: psycopg[binary]<=3.2.6,>=3.1.8
+Requires-Dist: psycopg[binary]<=3.2.7,>=3.1.8
 Requires-Dist: pyparsing<=3.2.3,>=3.1.0
 Requires-Dist: python-gnupg<=0.5.4,>=0.5
 Requires-Dist: PyYAML<=6.0.2,>=5.1.1
 Requires-Dist: redis<5.2.2,>=4.3
 Requires-Dist: tablib<3.6.0
-Requires-Dist: url-normalize<=2.2.0,>=1.4.3
+Requires-Dist: url-normalize<=2.2.1,>=1.4.3
 Requires-Dist: uuid6<=2024.7.10,>=2023.5.2
 Requires-Dist: whitenoise<6.10.0,>=5.0
 Requires-Dist: yarl<1.20.1,>=1.8
@@ -75,6 +75,9 @@ Requires-Dist: django-prometheus; extra == "prometheus"
 Provides-Extra: kafka
 Requires-Dist: cloudevents==1.11.0; extra == "kafka"
 Requires-Dist: confluent-kafka<2.10.0,>=2.4.0; extra == "kafka"
+Provides-Extra: diagnostics
+Requires-Dist: pyinstrument~=5.0; extra == "diagnostics"
+Requires-Dist: memray~=1.17; extra == "diagnostics"
 Dynamic: license-file
 
 

{pulpcore-3.76.0 → pulpcore-3.77.0}/pulp_certguard/app/__init__.py

@@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_certguard.app"
     label = "certguard"
-    version = "3.76.0"
+    version = "3.77.0"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.76.0 → pulpcore-3.77.0}/pulp_file/app/__init__.py

@@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_file.app"
     label = "file"
-    version = "3.76.0"
+    version = "3.77.0"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.76.0 → pulpcore-3.77.0}/pulp_file/tests/functional/api/test_remote_settings.py

@@ -45,9 +45,46 @@ IwtfRg==
 -----END CERTIFICATE-----
 """
 
+GOOD_CERT_TWO = """-----BEGIN CERTIFICATE-----
+MIICqjCCAZICAgtCMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNVBAMMB2dvdmVnYW4w
+HhcNMTkwMzEzMjEwMzMwWhcNMjkwMzEwMjEwMzMwWjAjMRAwDgYDVQQDDAdnb3Zl
+Z2FuMQ8wDQYDVQQKDAZjbGllbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCxJWx5t25jY4womWtKxGqv2LHg9YnU0b2VCECLhu5JjoAzFPja5VHB0Maz
+G8m5c0+N2ubrPcBC+KdoGMd2MqrrGyzKOiwbVDW0YOgnFqh58p796iKtVboWx41y
+Gzn289PzYccxH6mhhPmRVD25KyV1TenqvGIHJTepF7mgIemGDTv+j7+mYPT/3r6I
+pnwTkEVPr+Q4iW0l3fNESlFFRt2b7yhz9f0E4SMhmIRnSIGOLO1zE02IJ1hTuGkx
+/MZ1AqQdVSdm4jenTIMp91R1kYylI66yMcpU6w6x4j8qvJ8nBZ4r4DqOHcOobyHp
+qlaJjv/K5SGJxV2k0EFk7b483lbrAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBALYh
+SHLGJCxVL8ePFLs294fhTq4pTQsvHm8q3SyJD9DaB+HKTceCFErNv18Dsl/QwBis
+WPHWKpDN0EUcuuE/8oUaGjjzByJ8bPafMicFCHSSefcJw+IOOqKBkWDT+4YGkvfs
+RpwxSLqLOhEt7aSkiPcMvD20v8cvj0O36c5G3Vv0E8WmPWOEqjyPFoU9X1vACr+h
+DdIKvxFbvRU9ObektFxOYHuvP010IBv2dGyw3G5W5fh9A5OSXHAShWSwkRU36oft
+ugB47fIIlb7zLm4GBmxGG0yBwAf4otBlUXVNqNx15bbUuVgKbGMFfItQgEo9AQcz
+gGsetwDOs/NgZ95oH40=
+-----END CERTIFICATE-----
+"""
+
 BAD_CERT = """-----BEGIN CERTIFICATE-----\nBOGUS==\n-----END CERTIFICATE-----
 """
 
+NO_CERT = """
+MIICoDCCAYgCCQC2c2uY34HNlzANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdn
+b3ZlZ2FuMB4XDTE5MDMxMzIxMDMzMFoXDTM4MDYxNjIxMDMzMFowEjEQMA4GA1UE
+AwwHZ292ZWdhbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEatWsZ
+1iwGmTxD02dxMI4ci+Au4FzvmWLBWD07H5GGTVFwnqmNOKhP6DHs1EsMZevkUvaG
+CRxZlPYhjNFLZr2c2FnoDZ5nBXlSW6sodXURbMfyT187nDeBXVYFuh4T2eNCatnm
+t3vgdi+pWsF0LbOgpu7GJI2sh5K1imxyB77tJ7PFTDZCSohkK+A+0nDCnJqDUNXD
+5CK8iaBciCbnzp3nRKuM2EmgXno9Repy/HYxIgB7ZodPwDvYNjMGfvs0s9mJIKmc
+CKgkPXVO9y9gaRrrytICcPOs+YoU/PN4Ttg6wzxaWvJgw44vsR8wM/0i4HlXfBdl
+9br+cgn8jukDOgECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAyNHV6NA+0GfUrvBq
+AHXHNnBE3nzMhGPhF/0B/dO4o0n6pgGZyzRxaUaoo6+5oQnBf/2NmDyLWdalFWX7
+D1WBaxkhK+FU922+qwQKhABlwMxGCnfZ8F+rlk4lNotm3fP4wHbnO1SGIDvvZFt/
+mpMgkhwL4lShUFv57YylXr+D2vSFcAryKiVGk1X3sHMXlFAMLHUm3d97fJnmb1qQ
+wC43BlJCBQF98wKtYNwTUG/9gblfk8lCB2DL1hwmPy3q9KbSDOdUK3HW6a75ZzCD
+6mXc/Y0bJcwweDsywbPBYP13hYUcpw4htcU6hg6DsoAjLNkSrlY+GGo7htx+L9HH
+IwtfRg==
+"""
+
 
 def _run_basic_sync_and_assert(file_bindings, remote, file_repo, monitor_task):
     body = RepositorySyncURL(remote=remote.pulp_href)
@@ -274,3 +311,34 @@ def test_certificate_clean(file_remote_factory):
         a_remote = file_remote_factory(url="http://example.com/", ca_cert=BAD_CERT)
     with pytest.raises(BadRequestException):
         a_remote = file_remote_factory(url="http://example.com/", client_cert=BAD_CERT)
+
+    # Check that a no-cert string returns the expected error
+    with pytest.raises(BadRequestException):
+        a_remote = file_remote_factory(url="http://example.com/", ca_cert=NO_CERT)
+    with pytest.raises(BadRequestException):
+        a_remote = file_remote_factory(url="http://example.com/", client_cert=NO_CERT)
+
+
+@pytest.mark.parallel
+def test_multi_certificate_clean(file_remote_factory):
+    multi_cert = GOOD_CERT + GOOD_CERT_TWO
+
+    # Check that a good multi-cert PEM validates
+    a_remote = file_remote_factory(url="http://example.com/", ca_cert=multi_cert)
+    assert a_remote.ca_cert == multi_cert
+    a_remote = file_remote_factory(url="http://example.com/", client_cert=multi_cert)
+    assert a_remote.client_cert == multi_cert
+
+    # Check that a good-cert-with-comments validates and strips the comments
+    multi_cert_with_comment = GOOD_CERT_WITH_COMMENT + GOOD_CERT_TWO
+    a_remote = file_remote_factory(url="http://example.com/", ca_cert=multi_cert_with_comment)
+    assert a_remote.ca_cert == multi_cert
+    a_remote = file_remote_factory(url="http://example.com/", client_cert=multi_cert_with_comment)
+    assert a_remote.client_cert == multi_cert
+
+    # Check that multi-with-bad is rejected
+    multi_bad = GOOD_CERT + BAD_CERT
+    with pytest.raises(BadRequestException):
+        a_remote = file_remote_factory(url="http://example.com/", ca_cert=multi_bad)
+    with pytest.raises(BadRequestException):
+        a_remote = file_remote_factory(url="http://example.com/", client_cert=multi_bad)

{pulpcore-3.76.0 → pulpcore-3.77.0}/pulpcore/app/apps.py

@@ -247,7 +247,7 @@ class PulpAppConfig(PulpPluginAppConfig):
     label = "core"
 
     # The version of this app
-    version = "3.76.0"
+    version = "3.77.0"
 
     # The python package name providing this app
     python_package_name = "pulpcore"

{pulpcore-3.76.0 → pulpcore-3.77.0}/pulpcore/app/replica.py

@@ -8,7 +8,7 @@ from pulp_glue.common.context import PulpContext
 from pulpcore.app.models import UpstreamPulp
 from pulpcore.tasking.tasks import dispatch
 from pulpcore.app.tasks.base import (
-    general_update,
+    ageneral_update,
     general_create,
     general_multi_delete,
 )
@@ -133,7 +133,7 @@ class Replicator:
             needs_update = self.needs_update(remote_fields_dict, remote)
             if needs_update:
                 dispatch(
-                    general_update,
+                    ageneral_update,
                     task_group=self.task_group,
                     shared_resources=[self.server],
                     exclusive_resources=[remote],
@@ -162,7 +162,7 @@ class Replicator:
             needs_update = self.needs_update(repo_fields_dict, repository)
             if needs_update:
                 dispatch(
-                    general_update,
+                    ageneral_update,
                     task_group=self.task_group,
                     shared_resources=[self.server],
                     exclusive_resources=[repository],
@@ -197,7 +197,7 @@ class Replicator:
             if needs_update:
                 # Update the distribution
                 dispatch(
-                    general_update,
+                    ageneral_update,
                     task_group=self.task_group,
                     shared_resources=[repository, self.server],
                     exclusive_resources=self.distros_uris,

{pulpcore-3.76.0 → pulpcore-3.77.0}/pulpcore/app/serializers/publication.py

@@ -407,14 +407,34 @@ def validate_repo_and_remote(repository, field, **kwargs):
 
     detail_repo = repository.cast()
     if detail_repo.remote and type(detail_repo.remote.cast()) not in detail_repo.REMOTE_TYPES:
-        msg = (
-            f"Type for Remote '{get_prn(repository.remote)}' "
-            f"does not match Repository '{get_prn(repository)}'"
-        )
-        if repository_version := kwargs.pop("repository_version", None):
-            msg += f" from RepositoryVersion '{get_prn(repository_version)}'"
-        if publication := kwargs.pop("publication", None):
-            msg += f" from Publication '{get_prn(publication)}'"
-        msg += "."
+        repository_version = kwargs.pop("repository_version", None)
+        publication = kwargs.pop("publication", None)
+
+        if repository_version and publication:
+            msg_template = _(
+                "Type for Remote '{remote}' does not match Repository '{repository}' "
+                "from RepositoryVersion '{repository_version}' from Publication '{publication}'."
+            )
+        elif repository_version:
+            msg_template = _(
+                "Type for Remote '{remote}' does not match Repository '{repository}' "
+                "from RepositoryVersion '{repository_version}'."
+            )
+        elif publication:
+            msg_template = _(
+                "Type for Remote '{remote}' does not match Repository '{repository}' "
+                "from Publication '{publication}'."
+            )
+        else:
+            msg_template = _("Type for Remote '{remote}' does not match Repository '{repository}'.")
 
-        raise serializers.ValidationError({field: _(msg)})
+        raise serializers.ValidationError(
+            {
+                field: msg_template.format(
+                    remote=get_prn(repository.remote),
+                    repository=get_prn(repository),
+                    repository_version=get_prn(repository_version) if repository_version else "",
+                    publication=get_prn(publication) if publication else "",
+                )
+            }
+        )