Fixed migration of a distribution tree if it has a treeinfo and not .…

…treeinfo closes #6951 https://pulp.plan.io/issues/6951
pulp · Aug 7, 2020 · 5a38499 · 5a38499
1 parent 8ec0360
commit 5a38499
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/CHANGES/6951.bugfix b/CHANGES/6951.bugfix
@@ -0,0 +1 @@
+Fixed migration of a distribution tree if it has a treeinfo and not .treeinfo
diff --git a/pulp_2to3_migration/app/plugin/rpm/pulp_2to3_models.py b/pulp_2to3_migration/app/plugin/rpm/pulp_2to3_models.py
@@ -714,7 +714,7 @@ def create_pulp3_content(self):
         for namespace in namespaces:
             treeinfo = PulpTreeInfo()
             try:
-                treeinfo.load(f=os.path.join(self.pulp2content.pulp2_storage_path, '.treeinfo'))
+                treeinfo.load(f=os.path.join(self.pulp2content.pulp2_storage_path, namespace))
             except FileNotFoundError:
                 continue
             self.filename = namespace

diff --git a/pulp_2to3_migration/app/pre_migration.py b/pulp_2to3_migration/app/pre_migration.py
@@ -482,7 +482,6 @@ def pre_migrate_distributor(repo_id, distributors, distributor_migrators, repo=N
                       'pulp2_repository': repo,
                       'pulp2_repo_id': repo_id,
                       'is_migrated': False})
-
         if not created:
             # if it was marked as such because it was not present in the migration plan
             distributor.not_in_plan = False