katello 4.6.1 → 4.6.2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of katello might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/models/katello/root_repository.rb +2 -0
- data/app/services/katello/pulp3/repository.rb +1 -1
- data/app/services/katello/pulp3/repository_mirror.rb +1 -0
- data/db/migrate/20221206170122_update_ignore_srpm_to_false_for_mirror_complete.rb +5 -0
- data/lib/katello/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5d7693d6a56ee10971e122cad1954c027e6be19a6a5b97f0e6916d5c15429daa
|
4
|
+
data.tar.gz: 7bec1301d49c9f4fbb4ed36a4e18ef2ee2320007048ceb59ac6290bc19a7e705
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d76732ac02b89f7c71917dd97b86e4069f7d1d044005d2c97c43b097cad07b69f26fb1579c931eb9a23d35b8a47d0c85c76542bdedfc5c4392931f58dbeebe64
|
7
|
+
data.tar.gz: d30c17abe79a6c500e396098665c85a6cd7ccc5f1116771bab56a6426bc0d29bd8607d377f381db46962eb1138249076c5a888648d4064610a62e0a7bcc9f550
|
@@ -225,6 +225,8 @@ module Katello
|
|
225
225
|
errors.add(:ignorable_content, N_("Invalid value specified for ignorable content."))
|
226
226
|
elsif ignorable_content.any? { |item| !IGNORABLE_CONTENT_UNIT_TYPES.include?(item) }
|
227
227
|
errors.add(:ignorable_content, N_("Invalid value specified for ignorable content. Permissible values %s") % IGNORABLE_CONTENT_UNIT_TYPES.join(","))
|
228
|
+
elsif self.mirroring_policy == MIRRORING_POLICY_COMPLETE
|
229
|
+
errors.add(:ignorable_content, N_("Ignore %s can not be set in combination with 'Complete Mirroring' mirroring policy.") % IGNORABLE_CONTENT_UNIT_TYPES.join(","))
|
228
230
|
end
|
229
231
|
end
|
230
232
|
|
@@ -200,7 +200,7 @@ module Katello
|
|
200
200
|
|
201
201
|
def sync_url_params(_sync_options)
|
202
202
|
params = {remote: repo.remote_href, mirror: repo.root.mirroring_policy == Katello::RootRepository::MIRRORING_POLICY_CONTENT}
|
203
|
-
params[:skip_types] = skip_types if skip_types
|
203
|
+
params[:skip_types] = skip_types if (skip_types && repo.root.mirroring_policy != Katello::RootRepository::MIRRORING_POLICY_COMPLETE)
|
204
204
|
params
|
205
205
|
end
|
206
206
|
|
@@ -132,6 +132,7 @@ module Katello
|
|
132
132
|
sync_params = repo_service.sync_url_params(options)
|
133
133
|
sync_params[:remote] = remote_href
|
134
134
|
if repo.yum?
|
135
|
+
sync_params.delete(:skip_types) if sync_params[:skip_types]
|
135
136
|
sync_params[:sync_policy] = 'mirror_complete'
|
136
137
|
else
|
137
138
|
sync_params.delete(:sync_policy)
|
data/lib/katello/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: katello
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.6.
|
4
|
+
version: 4.6.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- N/A
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2023-01-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -2222,6 +2222,7 @@ files:
|
|
2222
2222
|
- db/migrate/20220524132259_remove_last_refreshed_from_katello_alternate_content_sources.rb
|
2223
2223
|
- db/migrate/20220601163911_add_vendor_to_katello_installed_packages.rb
|
2224
2224
|
- db/migrate/20220610165621_add_repositories_and_products_to_acs.rb
|
2225
|
+
- db/migrate/20221206170122_update_ignore_srpm_to_false_for_mirror_complete.rb
|
2225
2226
|
- db/seeds.d/101-locations.rb
|
2226
2227
|
- db/seeds.d/102-organizations.rb
|
2227
2228
|
- db/seeds.d/104-proxy.rb
|