katello 4.6.1 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12ea739397f1f4d796d7f7f7d0b6a052cd3ae03ff70cf81a0cfcd7c995eff9f1
-  data.tar.gz: c2898a211d290e996a71b0ca8ce68ef6353f1b76530f1cbca8c38eeb0ec2f19d
+  metadata.gz: 5d7693d6a56ee10971e122cad1954c027e6be19a6a5b97f0e6916d5c15429daa
+  data.tar.gz: 7bec1301d49c9f4fbb4ed36a4e18ef2ee2320007048ceb59ac6290bc19a7e705
 SHA512:
-  metadata.gz: a9f45a56723f68dd3e058d6b6b39ce1efe47bdef3c6ef49824e23ba56131bce7a3280f11cb5d967f3a1b065d48fb9b1b8ad1cfda66ca8c4385b8d9690446a510
-  data.tar.gz: 8d5d93e17e005cdcb2825891d3d2e1835633dfc9a1bb38f9621e26d9f17faef11a496a3e5fdf4894b502c8fd2f73bf64d0590f28031885e6d81912f801a308e8
+  metadata.gz: d76732ac02b89f7c71917dd97b86e4069f7d1d044005d2c97c43b097cad07b69f26fb1579c931eb9a23d35b8a47d0c85c76542bdedfc5c4392931f58dbeebe64
+  data.tar.gz: d30c17abe79a6c500e396098665c85a6cd7ccc5f1116771bab56a6426bc0d29bd8607d377f381db46962eb1138249076c5a888648d4064610a62e0a7bcc9f550

data/app/models/katello/root_repository.rb

@@ -225,6 +225,8 @@ module Katello
         errors.add(:ignorable_content, N_("Invalid value specified for ignorable content."))
       elsif ignorable_content.any? { |item| !IGNORABLE_CONTENT_UNIT_TYPES.include?(item) }
         errors.add(:ignorable_content, N_("Invalid value specified for ignorable content. Permissible values %s") % IGNORABLE_CONTENT_UNIT_TYPES.join(","))
+      elsif self.mirroring_policy == MIRRORING_POLICY_COMPLETE
+        errors.add(:ignorable_content, N_("Ignore %s can not be set in combination with 'Complete Mirroring' mirroring policy.") % IGNORABLE_CONTENT_UNIT_TYPES.join(","))
       end
     end
 

data/app/services/katello/pulp3/repository.rb

@@ -200,7 +200,7 @@ module Katello
 
       def sync_url_params(_sync_options)
         params = {remote: repo.remote_href, mirror: repo.root.mirroring_policy == Katello::RootRepository::MIRRORING_POLICY_CONTENT}
-        params[:skip_types] = skip_types if skip_types
+        params[:skip_types] = skip_types if (skip_types && repo.root.mirroring_policy != Katello::RootRepository::MIRRORING_POLICY_COMPLETE)
         params
       end
 

data/app/services/katello/pulp3/repository_mirror.rb

@@ -132,6 +132,7 @@ module Katello
         sync_params = repo_service.sync_url_params(options)
         sync_params[:remote] = remote_href
         if repo.yum?
+          sync_params.delete(:skip_types) if sync_params[:skip_types]
           sync_params[:sync_policy] = 'mirror_complete'
         else
           sync_params.delete(:sync_policy)

data/db/migrate/20221206170122_update_ignore_srpm_to_false_for_mirror_complete.rb

@@ -0,0 +1,5 @@
+class UpdateIgnoreSrpmToFalseForMirrorComplete < ActiveRecord::Migration[6.1]
+  def change
+    Katello::RootRepository.yum_type.where(mirroring_policy: 'mirror_complete', ignorable_content: ['srpm']).update_all(ignorable_content: [])
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.6.1".freeze
+  VERSION = "4.6.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.6.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2222,6 +2222,7 @@ files:
 - db/migrate/20220524132259_remove_last_refreshed_from_katello_alternate_content_sources.rb
 - db/migrate/20220601163911_add_vendor_to_katello_installed_packages.rb
 - db/migrate/20220610165621_add_repositories_and_products_to_acs.rb
+- db/migrate/20221206170122_update_ignore_srpm_to_false_for_mirror_complete.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb