Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #37595 - Drop defunct deb mirror_publication_options #11044

Merged
merged 1 commit into from
Jun 27, 2024
Merged

Fixes #37595 - Drop defunct deb mirror_publication_options #11044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions app/services/katello/pulp3/repository/apt.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 1 addition & 9 deletions app/services/katello/pulp3/repository_mirror.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,21 +166,13 @@ def remote_feed_url
uri.to_s
end

def publication_options(repository_version)
quba42 marked this conversation as resolved.
Show resolved Hide resolved
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)
quba42 marked this conversation as resolved.
Show resolved Hide resolved
api.publications_api.create(publication_data)
end
end
Expand Down
Loading