pulpcore 3.121.2__tar.gz → 3.121.3__tar.gz

{pulpcore-3.121.2 → pulpcore-3.121.3}/CHANGES.md

@@ -8,6 +8,28 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.121.3 (2026-10-09) {: #3.121.3 }
+
+### REST API {: #3.121.3-rest-api }
+
+#### Bugfixes {: #3.121.3-rest-api-bugfix }
+
+- Fixed directory listings for published content displaying publication time instead of repository added date.
+
+### Plugin API {: #3.121.3-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.121.3-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.121.3-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.121.2 (2026-10-08) {: #3.121.2 }
 
 ### REST API {: #3.121.2-rest-api }

{pulpcore-3.121.2 → pulpcore-3.121.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.121.2
+Version: 3.121.3
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 License-Expression: GPL-2.0-or-later

{pulpcore-3.121.2 → pulpcore-3.121.3}/pulp_certguard/app/__init__.py

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

{pulpcore-3.121.2 → pulpcore-3.121.3}/pulp_file/app/__init__.py

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

{pulpcore-3.121.2 → pulpcore-3.121.3}/pulpcore/app/apps.py

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

{pulpcore-3.121.2 → pulpcore-3.121.3}/pulpcore/content/handler.py

@@ -618,6 +618,11 @@ class Handler:
             elif current_date < timestamp:
                 dates[name] = timestamp
 
+        def update_content_date(content_dates, content_id, timestamp):
+            current_date = content_dates.get(content_id, None)
+            if current_date is None or current_date < timestamp:
+                content_dates[content_id] = timestamp
+
         def file_or_directory_name(directory_path, relative_path):
             result = re.match(r"({})([^\/]*)(\/*)".format(re.escape(directory_path)), relative_path)
             return "{}{}".format(result.groups()[1], result.groups()[2])
@@ -631,6 +636,7 @@ class Handler:
             directory_list = set()
             dates = {}
             content_to_find = {}
+            content_dates = {}
             sizes = {}
             artifacts_to_find = {}
 
@@ -641,8 +647,9 @@ class Handler:
                 for pa in pas:
                     name = file_or_directory_name(path, pa.relative_path)
                     directory_list.add(name)
-                    update_date(dates, name, pa.pulp_created)
-                    content_to_find[pa.content_artifact.content_id] = name
+                    content_id = pa.content_artifact.content_id
+                    update_content_date(content_dates, content_id, pa.pulp_created)
+                    content_to_find.setdefault(content_id, set()).add(name)
                     if not name.endswith("/"):
                         if pa.content_artifact.artifact:
                             sizes[name] = pa.content_artifact.artifact.size
@@ -656,8 +663,8 @@ class Handler:
                 for ca in cas:
                     name = file_or_directory_name(path, ca.relative_path)
                     directory_list.add(name)
-                    update_date(dates, name, ca.pulp_created)
-                    content_to_find[ca.content_id] = name
+                    update_content_date(content_dates, ca.content_id, ca.pulp_created)
+                    content_to_find.setdefault(ca.content_id, set()).add(name)
                     if not name.endswith("/"):
                         if ca.artifact:
                             sizes[name] = ca.artifact.size
@@ -668,7 +675,12 @@ class Handler:
                 # Find the dates the content got added to the repository
                 for rc in content_repo_ver._content_relationships():
                     if rc.content_id in content_to_find:
-                        update_date(dates, content_to_find[rc.content_id], rc.pulp_created)
+                        content_dates[rc.content_id] = rc.pulp_created
+
+                # Prefer repository membership dates, then aggregate the newest date per entry.
+                for content_id, names in content_to_find.items():
+                    for name in names:
+                        update_date(dates, name, content_dates[content_id])
 
                 # Find the sizes for on_demand artifacts
                 r_artifacts = RemoteArtifact.objects.filter(

{pulpcore-3.121.2 → pulpcore-3.121.3}/pulpcore/tests/unit/content/test_handler.py

@@ -26,9 +26,11 @@ from pulpcore.plugin.models import (
     ContentArtifact,
     Distribution,
     Publication,
+    PublishedArtifact,
     Remote,
     RemoteArtifact,
     Repository,
+    RepositoryContent,
     RepositoryVersion,
 )
 
@@ -334,6 +336,49 @@ async def test_list_directory_metadata(monkeypatch, use_publication):
     assert sizes["file.rpm"] == file_content.artifact.size
 
 
+@pytest.mark.asyncio
+@pytest.mark.django_db
+async def test_publication_listing_uses_repository_content_date():
+    """Publication dates fall back to repo dates, aggregated across directory children."""
+    older_repository_date = datetime(2026, 1, 1, tzinfo=timezone.utc)
+    newer_repository_date = datetime(2026, 1, 3, tzinfo=timezone.utc)
+    publication_date = datetime(2026, 1, 4, tzinfo=timezone.utc)
+    repository = await create_repository()
+    repo_version = await RepositoryVersion.objects.acreate(repository=repository, number=1)
+    publication = await Publication.objects.acreate(repository_version=repo_version)
+
+    for path, repository_date in (
+        ("packages/file.rpm", older_repository_date),
+        ("packages/nested/file.rpm", newer_repository_date),
+    ):
+        content = await create_content()
+        content_artifact = await create_content_artifact(content)
+        membership = await RepositoryContent.objects.acreate(
+            content=content, repository=repository, version_added=repo_version
+        )
+        membership.pulp_created = repository_date
+        await membership.asave(update_fields=("pulp_created",))
+
+        published_artifact = await PublishedArtifact.objects.acreate(
+            publication=publication,
+            content_artifact=content_artifact,
+            relative_path=path,
+        )
+        published_artifact.pulp_created = publication_date
+        await published_artifact.asave(update_fields=("pulp_created",))
+
+    directory_list, dates, _ = await Handler().list_directory(None, publication, "")
+
+    assert directory_list == {"packages/"}
+    assert dates["packages/"] == newer_repository_date
+
+    child_list, child_dates, _ = await Handler().list_directory(None, publication, "packages/")
+
+    assert child_list == {"file.rpm", "nested/"}
+    assert child_dates["file.rpm"] == older_repository_date
+    assert child_dates["nested/"] == newer_repository_date
+
+
 @pytest.mark.asyncio
 @pytest.mark.django_db
 async def test_pull_through_remote_artifact_exists(request123, tmp_path):

{pulpcore-3.121.2 → pulpcore-3.121.3}/pulpcore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.121.2
+Version: 3.121.3
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 License-Expression: GPL-2.0-or-later

{pulpcore-3.121.2 → pulpcore-3.121.3}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulpcore"
-version = "3.121.2"
+version = "3.121.3"
 description = "Pulp Django Application and Related Modules"
 readme = "README.md"
 authors = [
@@ -208,7 +208,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "3.121.2"
+current_version = "3.121.3"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"