From 23f3104683bc47944704cbc6cdce7d0552e82979 Mon Sep 17 00:00:00 2001 From: Quirin Pamp Date: Tue, 25 Jun 2024 16:03:25 +0200 Subject: [PATCH] Fixes #37595 - Drop defunct deb mirror_publication_options Ever since we switched to verbatim publications for deb content on smart proxies this code path has been unused. We could have cleaned it up as part of the original change in 4a363fd945d56ad48f6a30446d9c16320819d4a5, so I am doing so now. --- app/services/katello/pulp3/repository/apt.rb | 10 ---------- app/services/katello/pulp3/repository_mirror.rb | 10 +--------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/app/services/katello/pulp3/repository/apt.rb b/app/services/katello/pulp3/repository/apt.rb index 1ce24ca19c5..fe55848577d 100644 --- a/app/services/katello/pulp3/repository/apt.rb +++ b/app/services/katello/pulp3/repository/apt.rb @@ -51,16 +51,6 @@ def publication_options(repository_version) popts end - def mirror_publication_options - { - # Since we are synchronizing the "default" distribution from the simple publisher on the server, - # it will be included in the structured publish. Therefore, we MUST NOT use the simple publisher - # on the proxy, since this would collide! - #simple: true, - structured: true # publish real suites (e.g. 'stable') - } - end - def distribution_options(path) { base_path: path, diff --git a/app/services/katello/pulp3/repository_mirror.rb b/app/services/katello/pulp3/repository_mirror.rb index d7ad08819b0..e7e2f300091 100644 --- a/app/services/katello/pulp3/repository_mirror.rb +++ b/app/services/katello/pulp3/repository_mirror.rb @@ -166,21 +166,13 @@ def remote_feed_url uri.to_s end - def publication_options(repository_version) - popts = {repository_version: repository_version} - if (type_specific_options = repo_service.try(:mirror_publication_options)) - popts.merge!(type_specific_options) - end - popts - end - def create_publication if (href = version_href) if repo_service.repo.content_type == "deb" publication_data = api.publication_verbatim_class.new({repository_version: href}) api.publications_verbatim_api.create(publication_data) else - publication_data = api.publication_class.new(publication_options(href)) + publication_data = api.publication_class.new(repository_version: href) api.publications_api.create(publication_data) end end