app/lib/actions/katello/repository/update.rb in katello-2.4.0.rc3 vs app/lib/actions/katello/repository/update.rb in katello-2.4.0

@@ -4,17 +4,17 @@
       class Update < Actions::EntryAction
         def plan(repository, repo_params)
           action_subject repository
           repository.update_attributes!(repo_params)
 
-          if (SETTINGS[:katello][:use_cp] && SETTINGS[:katello][:use_pulp]) && repository.library_instance?
+          if update_content?(repository)
             plan_action(::Actions::Candlepin::Product::ContentUpdate,
                         :content_id => repository.content_id,
-                        :name => repository.name,
+                        :name => repository.content.name,
                         :content_url => ::Katello::Glue::Pulp::Repos.custom_content_path(repository.product, repository.label),
                         :gpg_key_url => repository.yum_gpg_key_url,
-                        :label => repository.custom_content_label,
+                        :label => repository.content.label,
                         :type => repository.content_type)
           end
 
           if SETTINGS[:katello][:use_pulp] && repository.pulp_update_needed?
             plan_action(::Actions::Pulp::Repository::Refresh, repository)
@@ -46,9 +46,18 @@
                           Runcible::Models::IsoDistributor
                         when ::Katello::Repository::DOCKER_TYPE
                           Runcible::Models::DockerDistributor
                         end
           distributor.type_id
+        end
+
+        private
+
+        def update_content?(repository)
+          SETTINGS[:katello][:use_cp] &&
+            SETTINGS[:katello][:use_pulp] &&
+            repository.library_instance? &&
+            !repository.product.redhat?
         end
       end
     end
   end
 end