Merge pull request #2881 from SFDO-Tooling/feature/fix-2gp-regression

Fix issue with 2GP extensions of 1GP packages
SFDO-Tooling · Sep 17, 2021 · c736014 · c736014
2 parents 01d16ec + 934e514
commit c736014
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -2,6 +2,14 @@
 History
 =======
 
+3.44.1 (2021-09-17)
+-------------------
+
+Issues Fixed
+
+- We fixed a regression that resulted in upload failures for 2GP packages that extend 1GP packages (closes #2880).
+
+
 3.44.0 (2021-09-16)
 -------------------
 

diff --git a/cumulusci/tasks/create_package_version.py b/cumulusci/tasks/create_package_version.py
@@ -609,7 +609,10 @@ def _convert_project_dependencies(self, dependencies):
         new_dependencies = []
         for dependency in dependencies:
             new_dependency = {}
-            if isinstance(dependency, PackageVersionIdDependency):
+            if isinstance(dependency, PackageVersionIdDependency) or (
+                isinstance(dependency, PackageNamespaceVersionDependency)
+                and dependency.version_id
+            ):
                 self.logger.info(
                     f"Adding dependency {dependency.package_name} with id {dependency.version_id}"
                 )

diff --git a/cumulusci/version.txt b/cumulusci/version.txt
@@ -1 +1 @@
-3.44.0
+3.44.1