katello 4.2.0.1.rc3 → 4.2.0.1
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/lib/actions/katello/capsule_content/sync_capsule.rb +1 -0
- data/app/lib/actions/katello/environment/publish_repositories.rb +1 -0
- data/app/lib/actions/katello/repository/instance_update.rb +1 -1
- data/app/services/katello/pulp3/repository.rb +11 -14
- data/app/services/katello/pulp3/repository_mirror.rb +1 -1
- data/lib/katello/version.rb +1 -1
- metadata +4 -26
- data/locale/bn/katello.po.time_stamp +0 -0
- data/locale/cs/katello.po.time_stamp +0 -0
- data/locale/de/katello.po.time_stamp +0 -0
- data/locale/en/katello.po.time_stamp +0 -0
- data/locale/es/katello.po.time_stamp +0 -0
- data/locale/fr/katello.po.time_stamp +0 -0
- data/locale/gu/katello.po.time_stamp +0 -0
- data/locale/hi/katello.po.time_stamp +0 -0
- data/locale/it/katello.po.time_stamp +0 -0
- data/locale/ja/katello.po.time_stamp +0 -0
- data/locale/kn/katello.po.time_stamp +0 -0
- data/locale/ko/katello.po.time_stamp +0 -0
- data/locale/mr/katello.po.time_stamp +0 -0
- data/locale/or/katello.po.time_stamp +0 -0
- data/locale/pa/katello.po.time_stamp +0 -0
- data/locale/pt/katello.po.time_stamp +0 -0
- data/locale/pt_BR/katello.po.time_stamp +0 -0
- data/locale/ru/katello.po.time_stamp +0 -0
- data/locale/ta/katello.po.time_stamp +0 -0
- data/locale/te/katello.po.time_stamp +0 -0
- data/locale/zh_CN/katello.po.time_stamp +0 -0
- data/locale/zh_TW/katello.po.time_stamp +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 584f61c17131168930ed4c8e69fc57b3365790d54e0a213d863b8f51fc08886f
|
4
|
+
data.tar.gz: 314009b6f1ff799a12f311733c84e63418d35fbc8df5d88bdb3655ae256829eb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4b1a04cb53666ed27b91417aafa1a560ef60c6ba5a2867e920241f09c1a7d0848ef6066317746b24c88492426790f13ff3abfffadc9bd3da29719ad0190009ab
|
7
|
+
data.tar.gz: 5e633218d1dc29742b64649697b358637df14e57c249ef21ca2a7d3341b4fe4826ed4a7c505d3105ef810dec2368d40f484a3e07d869c1bba3068fb6e1ca2f08
|
@@ -11,6 +11,7 @@ module Actions
|
|
11
11
|
skip_metadata_check = options.fetch(:skip_metadata_check, false)
|
12
12
|
sequence do
|
13
13
|
repos = repos_to_sync(smart_proxy, environment, content_view, repository, skip_metadata_check)
|
14
|
+
return nil if repos.empty?
|
14
15
|
|
15
16
|
repos.in_groups_of(Setting[:foreman_proxy_content_batch_size], false) do |repo_batch|
|
16
17
|
concurrence do
|
@@ -16,6 +16,7 @@ module Actions
|
|
16
16
|
repositories.each do |repository|
|
17
17
|
sequence do
|
18
18
|
repository.set_container_repository_name
|
19
|
+
repository.clear_smart_proxy_sync_histories
|
19
20
|
plan_action(::Actions::Katello::Repository::InstanceUpdate, repository)
|
20
21
|
plan_action(::Actions::Katello::Repository::CapsuleSync, repository)
|
21
22
|
end
|
@@ -7,7 +7,7 @@ module Actions
|
|
7
7
|
def plan(repository)
|
8
8
|
action_subject repository
|
9
9
|
repository.save!
|
10
|
-
plan_action(::Actions::Pulp3::Orchestration::Repository::RefreshIfNeeded, repository)
|
10
|
+
plan_action(::Actions::Pulp3::Orchestration::Repository::RefreshIfNeeded, repository, SmartProxy.pulp_primary)
|
11
11
|
plan_self(:repository_id => repository.id)
|
12
12
|
end
|
13
13
|
|
@@ -185,7 +185,7 @@ module Katello
|
|
185
185
|
def distribution_needs_update?
|
186
186
|
if distribution_reference
|
187
187
|
expected = secure_distribution_options(relative_path).except(:name).compact
|
188
|
-
actual = get_distribution
|
188
|
+
actual = get_distribution&.to_hash || {}
|
189
189
|
expected != actual.slice(*expected.keys)
|
190
190
|
elsif repo.environment
|
191
191
|
true
|
@@ -262,21 +262,18 @@ module Katello
|
|
262
262
|
else
|
263
263
|
dist = lookup_distributions(base_path: repo.relative_path).first
|
264
264
|
end
|
265
|
+
dist_ref = distribution_reference
|
265
266
|
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
# If we have a DistributionReference, update the distribution
|
270
|
-
if dist_ref
|
271
|
-
return update_distribution
|
272
|
-
# If no DistributionReference, create a DistributionReference and return
|
273
|
-
else
|
274
|
-
save_distribution_references([dist.pulp_href])
|
275
|
-
return []
|
276
|
-
end
|
267
|
+
if dist && !dist_ref
|
268
|
+
save_distribution_references([dist.pulp_href])
|
269
|
+
return update_distribution
|
277
270
|
end
|
278
271
|
|
279
|
-
|
272
|
+
if dist_ref
|
273
|
+
return update_distribution
|
274
|
+
end
|
275
|
+
|
276
|
+
# Since we got this far, we need to create a new distribution
|
280
277
|
begin
|
281
278
|
create_distribution(relative_path)
|
282
279
|
rescue api.class.client_module::ApiError => e
|
@@ -285,7 +282,7 @@ module Katello
|
|
285
282
|
e.message.include?("\"base_path\":[\"Overlaps with existing distribution\"")
|
286
283
|
dist = lookup_distributions(base_path: repo.relative_path).first
|
287
284
|
save_distribution_references([dist.pulp_href])
|
288
|
-
return
|
285
|
+
return update_distribution
|
289
286
|
else
|
290
287
|
raise e
|
291
288
|
end
|
@@ -160,7 +160,7 @@ module Katello
|
|
160
160
|
if (distro = repo_service.lookup_distributions(base_path: path).first) ||
|
161
161
|
(distro = repo_service.lookup_distributions(name: "#{backend_object_name}").first)
|
162
162
|
# update dist
|
163
|
-
dist_options = dist_options.except(:name
|
163
|
+
dist_options = dist_options.except(:name)
|
164
164
|
api.distributions_api.partial_update(distro.pulp_href, dist_options)
|
165
165
|
else
|
166
166
|
# create dist
|
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.2.0.1
|
4
|
+
version: 4.2.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- N/A
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-10-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -4497,52 +4497,30 @@ files:
|
|
4497
4497
|
- locale/README
|
4498
4498
|
- locale/action_names.rb
|
4499
4499
|
- locale/bn/katello.po
|
4500
|
-
- locale/bn/katello.po.time_stamp
|
4501
4500
|
- locale/cs/katello.po
|
4502
|
-
- locale/cs/katello.po.time_stamp
|
4503
4501
|
- locale/de/katello.po
|
4504
|
-
- locale/de/katello.po.time_stamp
|
4505
4502
|
- locale/en/katello.po
|
4506
|
-
- locale/en/katello.po.time_stamp
|
4507
4503
|
- locale/es/katello.po
|
4508
|
-
- locale/es/katello.po.time_stamp
|
4509
4504
|
- locale/fr/katello.po
|
4510
|
-
- locale/fr/katello.po.time_stamp
|
4511
4505
|
- locale/gu/katello.po
|
4512
|
-
- locale/gu/katello.po.time_stamp
|
4513
4506
|
- locale/hi/katello.po
|
4514
|
-
- locale/hi/katello.po.time_stamp
|
4515
4507
|
- locale/it/katello.po
|
4516
|
-
- locale/it/katello.po.time_stamp
|
4517
4508
|
- locale/ja/katello.po
|
4518
|
-
- locale/ja/katello.po.time_stamp
|
4519
4509
|
- locale/katello.pot
|
4520
4510
|
- locale/kn/katello.po
|
4521
|
-
- locale/kn/katello.po.time_stamp
|
4522
4511
|
- locale/ko/katello.po
|
4523
|
-
- locale/ko/katello.po.time_stamp
|
4524
4512
|
- locale/mr/katello.po
|
4525
|
-
- locale/mr/katello.po.time_stamp
|
4526
4513
|
- locale/or/katello.po
|
4527
|
-
- locale/or/katello.po.time_stamp
|
4528
4514
|
- locale/pa/katello.po
|
4529
|
-
- locale/pa/katello.po.time_stamp
|
4530
4515
|
- locale/pt/katello.po
|
4531
|
-
- locale/pt/katello.po.time_stamp
|
4532
4516
|
- locale/pt_BR/katello.po
|
4533
|
-
- locale/pt_BR/katello.po.time_stamp
|
4534
4517
|
- locale/ru/katello.po
|
4535
|
-
- locale/ru/katello.po.time_stamp
|
4536
4518
|
- locale/ta/katello.po
|
4537
|
-
- locale/ta/katello.po.time_stamp
|
4538
4519
|
- locale/te/katello.po
|
4539
|
-
- locale/te/katello.po.time_stamp
|
4540
4520
|
- locale/update-i18n
|
4541
4521
|
- locale/zanata.xml
|
4542
4522
|
- locale/zh_CN/katello.po
|
4543
|
-
- locale/zh_CN/katello.po.time_stamp
|
4544
4523
|
- locale/zh_TW/katello.po
|
4545
|
-
- locale/zh_TW/katello.po.time_stamp
|
4546
4524
|
- package.json
|
4547
4525
|
- vendor/assets/images/katello/add2.png
|
4548
4526
|
- vendor/assets/images/katello/addhost.png
|
@@ -5161,9 +5139,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
5161
5139
|
version: '2.5'
|
5162
5140
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
5163
5141
|
requirements:
|
5164
|
-
- - "
|
5142
|
+
- - ">="
|
5165
5143
|
- !ruby/object:Gem::Version
|
5166
|
-
version:
|
5144
|
+
version: '0'
|
5167
5145
|
requirements: []
|
5168
5146
|
rubygems_version: 3.1.6
|
5169
5147
|
signing_key:
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|