Fixes #37998 - deb-repos not shown on host repo-set

Katello · Nov 8, 2024 · f33bac3 · f33bac3
1 parent 12b5a3d
commit f33bac3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/services/katello/product_content_finder.rb b/app/services/katello/product_content_finder.rb
@@ -16,6 +16,7 @@ def initialize(params = {})
     def product_content
       if match_environment
         versions = consumable.content_view_environments.select(:content_view_version_id).map(&:content_view_version_id)
+        environment = consumable.respond_to?(:environment) ? consumable.environment : consumable.content_view_environments.select(:environment_id).map(&:environment_id)
       end
 
       considered_products = match_subscription ? consumable.products : consumable.organization.products.enabled.uniq
@@ -26,7 +27,8 @@ def product_content
       structured_apt_roots = roots.where(:content_id => nil)
       if structured_apt_roots.any?
         deb_repos_query = Katello::Repository.where(root: structured_apt_roots)
-        deb_repos = match_environment ? deb_repos_query.where(content_view_version: versions, environment: consumable.environment) : deb_repos_query.where(:library_instance_id => nil)
+        deb_repos = match_environment ? deb_repos_query.where(content_view_version: versions) : deb_repos_query.where(:library_instance_id => nil)
+        deb_repos = deb_repos.where(environment: environment) if environment
         content_ids += deb_repos.pluck(:content_id)
       end