katello 4.2.0.1.rc3 → 4.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d21cfa77627ae227af66157509f62c5b035a89a46b403d607ba6c70926b7253a
-  data.tar.gz: b9dd69ad43fb90ad1af496ac476e38083e0942ed0f114171c5cfe1b32c075c7b
+  metadata.gz: 584f61c17131168930ed4c8e69fc57b3365790d54e0a213d863b8f51fc08886f
+  data.tar.gz: 314009b6f1ff799a12f311733c84e63418d35fbc8df5d88bdb3655ae256829eb
 SHA512:
-  metadata.gz: 7e264679f2c596a41ee24e322f0ca2bc521c89b6a18b6d9d245b987d4dae13cd55cbf18483430d590b15c8aa565bbf6e28c5550bc6969a662034e50c2054a214
-  data.tar.gz: 985b102bdd203636c1c84cc038f29fdb7050ea95bb4bd7a7227c4a67d3d3f33a088c7913c75a6a89e5c2f9c8792812101aedd503a67e8ce15fb965a570479b21
+  metadata.gz: 4b1a04cb53666ed27b91417aafa1a560ef60c6ba5a2867e920241f09c1a7d0848ef6066317746b24c88492426790f13ff3abfffadc9bd3da29719ad0190009ab
+  data.tar.gz: 5e633218d1dc29742b64649697b358637df14e57c249ef21ca2a7d3341b4fe4826ed4a7c505d3105ef810dec2368d40f484a3e07d869c1bba3068fb6e1ca2f08

data/app/lib/actions/katello/capsule_content/sync_capsule.rb

@@ -11,6 +11,7 @@ module Actions
           skip_metadata_check = options.fetch(:skip_metadata_check, false)
           sequence do
             repos = repos_to_sync(smart_proxy, environment, content_view, repository, skip_metadata_check)
+            return nil if repos.empty?
 
             repos.in_groups_of(Setting[:foreman_proxy_content_batch_size], false) do |repo_batch|
               concurrence do

data/app/lib/actions/katello/environment/publish_repositories.rb

@@ -16,6 +16,7 @@ module Actions
             repositories.each do |repository|
               sequence do
                 repository.set_container_repository_name
+                repository.clear_smart_proxy_sync_histories
                 plan_action(::Actions::Katello::Repository::InstanceUpdate, repository)
                 plan_action(::Actions::Katello::Repository::CapsuleSync, repository)
               end

data/app/lib/actions/katello/repository/instance_update.rb

@@ -7,7 +7,7 @@ module Actions
         def plan(repository)
           action_subject repository
           repository.save!
-          plan_action(::Actions::Pulp3::Orchestration::Repository::RefreshIfNeeded, repository)
+          plan_action(::Actions::Pulp3::Orchestration::Repository::RefreshIfNeeded, repository, SmartProxy.pulp_primary)
           plan_self(:repository_id => repository.id)
         end
 

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

@@ -185,7 +185,7 @@ module Katello
       def distribution_needs_update?
         if distribution_reference
           expected = secure_distribution_options(relative_path).except(:name).compact
-          actual = get_distribution.to_hash
+          actual = get_distribution&.to_hash || {}
           expected != actual.slice(*expected.keys)
         elsif repo.environment
           true
@@ -262,21 +262,18 @@ module Katello
         else
           dist = lookup_distributions(base_path: repo.relative_path).first
         end
+        dist_ref = distribution_reference
 
-        # First check if the distribution exists
-        if dist
-          dist_ref = distribution_reference
-          # If we have a DistributionReference, update the distribution
-          if dist_ref
-            return update_distribution
-          # If no DistributionReference, create a DistributionReference and return
-          else
-            save_distribution_references([dist.pulp_href])
-            return []
-          end
+        if dist && !dist_ref
+          save_distribution_references([dist.pulp_href])
+          return update_distribution
         end
 
-        # So far, it looks like there is no distribution. Try to create one.
+        if dist_ref
+          return update_distribution
+        end
+
+        # Since we got this far, we need to create a new distribution
         begin
           create_distribution(relative_path)
         rescue api.class.client_module::ApiError => e
@@ -285,7 +282,7 @@ module Katello
               e.message.include?("\"base_path\":[\"Overlaps with existing distribution\"")
             dist = lookup_distributions(base_path: repo.relative_path).first
             save_distribution_references([dist.pulp_href])
-            return []
+            return update_distribution
           else
             raise e
           end

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

@@ -160,7 +160,7 @@ module Katello
         if (distro = repo_service.lookup_distributions(base_path: path).first) ||
           (distro = repo_service.lookup_distributions(name: "#{backend_object_name}").first)
           # update dist
-          dist_options = dist_options.except(:name, :base_path)
+          dist_options = dist_options.except(:name)
           api.distributions_api.partial_update(distro.pulp_href, dist_options)
         else
           # create dist

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.2.0.1.rc3".freeze
+  VERSION = "4.2.0.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.2.0.1.rc3
+  version: 4.2.0.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -4497,52 +4497,30 @@ files:
 - locale/README
 - locale/action_names.rb
 - locale/bn/katello.po
-- locale/bn/katello.po.time_stamp
 - locale/cs/katello.po
-- locale/cs/katello.po.time_stamp
 - locale/de/katello.po
-- locale/de/katello.po.time_stamp
 - locale/en/katello.po
-- locale/en/katello.po.time_stamp
 - locale/es/katello.po
-- locale/es/katello.po.time_stamp
 - locale/fr/katello.po
-- locale/fr/katello.po.time_stamp
 - locale/gu/katello.po
-- locale/gu/katello.po.time_stamp
 - locale/hi/katello.po
-- locale/hi/katello.po.time_stamp
 - locale/it/katello.po
-- locale/it/katello.po.time_stamp
 - locale/ja/katello.po
-- locale/ja/katello.po.time_stamp
 - locale/katello.pot
 - locale/kn/katello.po
-- locale/kn/katello.po.time_stamp
 - locale/ko/katello.po
-- locale/ko/katello.po.time_stamp
 - locale/mr/katello.po
-- locale/mr/katello.po.time_stamp
 - locale/or/katello.po
-- locale/or/katello.po.time_stamp
 - locale/pa/katello.po
-- locale/pa/katello.po.time_stamp
 - locale/pt/katello.po
-- locale/pt/katello.po.time_stamp
 - locale/pt_BR/katello.po
-- locale/pt_BR/katello.po.time_stamp
 - locale/ru/katello.po
-- locale/ru/katello.po.time_stamp
 - locale/ta/katello.po
-- locale/ta/katello.po.time_stamp
 - locale/te/katello.po
-- locale/te/katello.po.time_stamp
 - locale/update-i18n
 - locale/zanata.xml
 - locale/zh_CN/katello.po
-- locale/zh_CN/katello.po.time_stamp
 - locale/zh_TW/katello.po
-- locale/zh_TW/katello.po.time_stamp
 - package.json
 - vendor/assets/images/katello/add2.png
 - vendor/assets/images/katello/addhost.png
@@ -5161,9 +5139,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: