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.

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

Conversation

quba42
Copy link
Contributor

@quba42 quba42 commented Jun 25, 2024

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 change in 4a363fd.

What are the changes introduced in this pull request?

Cleans up some dead code. From using git grep, it is clear only deb content has mirror_publication_options defined, but ever since https://projects.theforeman.org/issues/35959 deb content no longer uses those publication options, because a verbatim publication is used instead.

What are the testing steps for this pull request?

One could sync some deb content and some non deb content to smart proxy as a test, but it is pretty clear from the code that this change has no effect.

@Manisha15
Copy link
Contributor

Looks good to me.

Copy link
Contributor

@wbclark wbclark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cleans up some dead code. From using git grep, it is clear only deb content has mirror_publication_options defined, but ever since https://projects.theforeman.org/issues/35959 deb content no longer uses those publication options, because a verbatim publication is used instead.

Hey @quba42 ! It's possible I'm missing some context, but from https://projects.theforeman.org/issues/35959 I found the unmerged draft PR #10420 -- should that go in first?

@quba42
Copy link
Contributor Author

quba42 commented Jun 26, 2024

@wbclark This change makes sense independently of the changes in #10420 and is ready now. Once this is merged, I will soon rebase an updated version of #10420 on top of this change. I found this change while working on #10420, but decided to open this PR separately, because it is small, easy to review in isolation and unrelated to the structured APT feature.

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 4a363fd,
so I am doing so now.
@quba42 quba42 force-pushed the cleanup_apt_mirror_publication_options branch from 220e756 to 116ef42 Compare June 26, 2024 16:34
Copy link
Contributor

@wbclark wbclark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the additional context.

The code looks fine and worked for me in some basic testing. I can see that the apt mirror_publication_options is not reachable via any code path. I didn't see anything in test/services/katello/pulp3/* that would require any update to accommodate this change, and the tests are green.

I have one (non-blocking) observation/idea (see comment below), and I'm honestly fine with merging this either way so I'll go ahead and ACK it and you can make the final call. ;-)

@wbclark wbclark merged commit 23f3104 into Katello:master Jun 27, 2024
25 checks passed
@quba42 quba42 deleted the cleanup_apt_mirror_publication_options branch June 27, 2024 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants