katello 3.17.0.rc2 → 3.17.0.rc2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: eeb58f6a9184f9ff8d2babd8e40c76807537cdbef92ab03a505a08dec80b0fff
|
|
4
|
+
data.tar.gz: 3d86164982c3760dd5b2916b49f4921f36aedcbd39d1557a4b5726a154809a8e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2230bed87282a34f9ae60383075c37230626d003c41e8799892741936fd557d1c5b9d34a0b41f5affa08bf81c1720440b745239a2ba9c3309982d3560fccca1e
|
|
7
|
+
data.tar.gz: 0f8f50c7bfd21111b21b7cbe4187e599847b3c0b1c0d55ef7d4751af57bb64881ae29f9f5c8845923601d057a0d2c4b71df16ec9787ccea76c900f35ccd3d2cc
|
|
@@ -266,8 +266,9 @@ module Actions
|
|
|
266
266
|
history.status = ::Katello::ContentViewHistory::SUCCESSFUL
|
|
267
267
|
history.save!
|
|
268
268
|
|
|
269
|
-
|
|
270
|
-
|
|
269
|
+
cvv_yum_repos = version.repositories.yum_type
|
|
270
|
+
unless cvv_yum_repos.empty? || SmartProxy.pulp_primary.pulp3_support?(cvv_yum_repos.first)
|
|
271
|
+
cvv_yum_repos.each do |repo|
|
|
271
272
|
SmartProxy.pulp_primary.pulp_api.extensions.send(:module_default).
|
|
272
273
|
copy(repo.library_instance.pulp_id,
|
|
273
274
|
repo.pulp_id)
|
|
@@ -171,7 +171,7 @@ module Katello
|
|
|
171
171
|
relative_path = pulp3_api.distributions_api.read(href).base_path
|
|
172
172
|
|
|
173
173
|
dist_ref = Katello::Pulp3::DistributionReference.find_or_initialize_by(:path => relative_path)
|
|
174
|
-
if (distribution_repo = Katello::Repository.find_by(:relative_path => relative_path))
|
|
174
|
+
if (distribution_repo = Katello::Repository.find_by(:relative_path => relative_path) || Katello::Repository.find_by(:container_repository_name => relative_path))
|
|
175
175
|
dist_ref.href = href
|
|
176
176
|
dist_ref.repository_id = distribution_repo.id
|
|
177
177
|
dist_ref.save!
|
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: 3.17.0.rc2
|
|
4
|
+
version: 3.17.0.rc2.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: 2020-
|
|
11
|
+
date: 2020-10-15 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|
|
@@ -4993,7 +4993,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
4993
4993
|
- !ruby/object:Gem::Version
|
|
4994
4994
|
version: 1.3.1
|
|
4995
4995
|
requirements: []
|
|
4996
|
-
rubygems_version: 3.0.
|
|
4996
|
+
rubygems_version: 3.0.3
|
|
4997
4997
|
signing_key:
|
|
4998
4998
|
specification_version: 4
|
|
4999
4999
|
summary: Content and Subscription Management plugin for Foreman
|