Fixes #34550 - run no migration tasks if nothing to migrate

Katello · Mar 4, 2022 · a7d948a · a7d948a
1 parent 27d820d
commit a7d948a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/services/katello/pulp3/migration.rb b/app/services/katello/pulp3/migration.rb
@@ -65,7 +65,11 @@ def pulp2_repositories_api
 
       def create_and_run_migrations
         migs = create_migrations
-        migs.map { |href| start_migration(href) }
+        if migs.any?
+          migs.map { |href| start_migration(href) }
+        else
+          []
+        end
       end
 
       def self.ignorable_content_types

diff --git a/app/services/katello/pulp3/migration_plan.rb b/app/services/katello/pulp3/migration_plan.rb
@@ -18,12 +18,13 @@ def generate
       end
 
       def generate_plugins
-        @repository_types.sort.map do |repository_type|
+        plugins = @repository_types.sort.map do |repository_type|
           {
             type: self.class.pulp2_repository_type(repository_type),
             repositories: repository_migrations(repository_type)
           }
         end
+        plugins.select { |plugin| plugin[:repositories].any? }
       end
 
       def self.pulp2_repository_type(repository_type)