pulpcore 3.22.10__tar.gz → 3.22.12__tar.gz

{pulpcore-3.22.10 → pulpcore-3.22.12}/CHANGES.rst

@@ -17,6 +17,42 @@ Changelog
 
 .. towncrier release notes start
 
+3.22.12 (2023-08-01)
+====================
+REST API
+--------
+
+Bugfixes
+~~~~~~~~
+
+- Correctly fixed pulp_rpm-export-edgecase - fix #4210 was incomplete.
+  :github:`4231`
+
+
+Plugin API
+----------
+
+No significant changes.
+
+
+3.22.11 (2023-07-31)
+====================
+REST API
+--------
+
+Bugfixes
+~~~~~~~~
+
+- Fix a subtle export bug introduced from the optimizations in #4159.
+  :github:`4210`
+
+
+Plugin API
+----------
+
+No significant changes.
+
+
 3.22.10 (2023-07-29)
 ====================
 REST API

{pulpcore-3.22.10 → pulpcore-3.22.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulpcore
-Version: 3.22.10
+Version: 3.22.12
 Summary: Pulp Django Application and Related Modules
 Home-page: https://pulpproject.org
 Author: Pulp Team

{pulpcore-3.22.10 → pulpcore-3.22.12}/pulpcore/app/apps.py

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

{pulpcore-3.22.10 → pulpcore-3.22.12}/pulpcore/app/importexport.py

@@ -94,14 +94,14 @@ def export_artifacts(export, artifacts):
 
     Args:
         export (django.db.models.PulpExport): export instance that's doing the export
-        artifacts (django.db.models.Artifacts): QuerySet of artifacts in all repos being exported
+        artifacts (django.db.models.Artifacts): List of artifacts in all repos being exported
 
     Raises:
         ValidationError: When path is not in the ALLOWED_EXPORT_PATHS setting
     """
     data = dict(message="Exporting Artifacts", code="export.artifacts", total=len(artifacts))
     with ProgressReport(**data) as pb:
-        for artifact in artifacts.iterator():  # chunk_size= defaults to 2000 at a fetch
+        for artifact in pb.iter(artifacts):
             dest = artifact.file.name
             if settings.DEFAULT_FILE_STORAGE != "pulpcore.app.models.storage.FileSystem":
                 with tempfile.TemporaryDirectory(dir=".") as temp_dir:
@@ -112,7 +112,6 @@ def export_artifacts(export, artifacts):
                         export.tarfile.add(temp_file.name, dest)
             else:
                 export.tarfile.add(artifact.file.path, dest)
-            pb.increment()
 
     resource = ArtifactResource()
     resource.queryset = artifacts

{pulpcore-3.22.10 → pulpcore-3.22.12}/pulpcore/app/tasks/export.py

@@ -500,7 +500,7 @@ def _do_export(pulp_exporter, tar, the_export):
     starting_versions = _get_starting_versions(do_incremental, pulp_exporter, the_export)
     vers_match = _version_match(ending_versions, starting_versions)
     # Gather up versions and artifacts
-    artifacts = None  # Will be a QuerySet selecting the Artifacts that need to be exported
+    artifacts = set()
     for version in ending_versions:
         # Check version-content to make sure we're not being asked to export
         # an on_demand repo
@@ -509,20 +509,16 @@ def _do_export(pulp_exporter, tar, the_export):
             raise RuntimeError(_("Remote artifacts cannot be exported."))
 
         if do_incremental:
-            vers_artifacts = version.artifacts.difference(vers_match[version].artifacts)
+            vers_artifacts = version.artifacts.difference(vers_match[version].artifacts).all()
         else:
-            vers_artifacts = version.artifacts
-
-        if artifacts:
-            artifacts.union(vers_artifacts)
-        else:
-            artifacts = vers_artifacts
+            vers_artifacts = version.artifacts.all()
+        artifacts.update(vers_artifacts)
 
     # export plugin-version-info
     export_versions(the_export, plugin_version_info)
     # Export the top-level entities (artifacts and repositories)
     # Note: we've already handled "what about incrementals" when building the 'artifacts' list
-    export_artifacts(the_export, artifacts)
+    export_artifacts(the_export, list(artifacts))
     # Export the repository-version data, per-version
     for version in ending_versions:
         export_content(the_export, version)

{pulpcore-3.22.10 → pulpcore-3.22.12}/pulpcore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulpcore
-Version: 3.22.10
+Version: 3.22.12
 Summary: Pulp Django Application and Related Modules
 Home-page: https://pulpproject.org
 Author: Pulp Team

{pulpcore-3.22.10 → pulpcore-3.22.12}/setup.py

@@ -8,7 +8,7 @@ with open("requirements.txt") as requirements:
 
 setup(
     name="pulpcore",
-    version="3.22.10",
+    version="3.22.12",
     description="Pulp Django Application and Related Modules",
     long_description=long_description,
     long_description_content_type="text/markdown",