Attachment 1481455 Details for Bug 1626294 – 6.3 patch.

[patch] 6.3 patch.

7684.patch (text/plain), 2.11 KB, created by Justin Sherrill on 2018-09-07 01:24:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Justin Sherrill

Created: 2018-09-07 01:24:02 UTC

Size: 2.11 KB

patch

obsolete

>From 0aab9a319b1c97769bfe4373e68d677e2790ce1d Mon Sep 17 00:00:00 2001
>From: Justin Sherrill <jsherril@redhat.com>
>Date: Thu, 6 Sep 2018 21:18:28 -0400
>Subject: [PATCH] Fixes #1626294 - use force full with yum_clone distributor
>
>---
> app/lib/actions/katello/repository/metadata_generate.rb | 2 +-
> app/lib/actions/pulp/repository/distributor_publish.rb  | 5 +++--
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/app/lib/actions/katello/repository/metadata_generate.rb b/app/lib/actions/katello/repository/metadata_generate.rb
>index 1c676f5411..e05d09e215 100644
>--- a/app/lib/actions/katello/repository/metadata_generate.rb
>+++ b/app/lib/actions/katello/repository/metadata_generate.rb
>@@ -21,7 +21,7 @@ def plan(repository, options = {})
>         end
> 
>         def override_config(distributor_class, force)
>-          if distributor_class == Runcible::Models::YumDistributor
>+          if distributor_class == Runcible::Models::YumDistributor || distributor_class == Runcible::Models::YumCloneDistributor
>             {:force_full => force}
>           else
>             {}
>diff --git a/app/lib/actions/pulp/repository/distributor_publish.rb b/app/lib/actions/pulp/repository/distributor_publish.rb
>index 8205ced7d5..519ce3aaa7 100644
>--- a/app/lib/actions/pulp/repository/distributor_publish.rb
>+++ b/app/lib/actions/pulp/repository/distributor_publish.rb
>@@ -28,10 +28,11 @@ def distributor_id(pulp_id, distributor_type_id)
>         end
> 
>         def distributor_config
>+          input[:override_config] ||= {}
>           # the check for YumCloneDistributor is here for backwards compatibility
>           if input[:distributor_type_id] == Runcible::Models::YumCloneDistributor.type_id
>-            { override_config: { source_repo_id: input[:source_pulp_id],
>-                                 source_distributor_id: source_distributor_id} }
>+            { override_config: input[:override_config].merge(source_repo_id: input[:source_pulp_id],
>+                                                               source_distributor_id: source_distributor_id) }
>           else
>             { override_config: input[:override_config] }
>           end

Actions: View | Diff

Attachments on bug 1626294: 1481455