fixes #21951 - don't allow export of on-demand repos #7338
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Issues: #21951 |
|
[test katello] |
stbenjam
changed the title
|
Addressed the feedback I got this morning. Individual repositories are handled, and error message now includes the names of which repos are on-demand: |
cfouant
reviewed
May 2, 2018
| @@ -250,6 +250,8 @@ def export | |||
|
|
|||
| fail HttpErrors::BadRequest, _("Repository content type must be 'yum' to export.") unless @repository.content_type == 'yum' | |||
|
|
|||
| fail HttpErrors::BadRequest, _("On-demand repositories cannot be exported.") if @repository.download_policy == ::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND | |||
There was a problem hiding this comment.
nitpick: Since hammer/UI refer to this as on demand, can we remove the hyphen?
| @@ -82,6 +82,10 @@ def export | |||
| fail HttpErrors::BadRequest, _("ISO export must be enabled when specifying ISO size") | |||
| end | |||
|
|
|||
| if (repos = @version.content_view.on_demand_repositories).any? | |||
| fail HttpErrors::BadRequest, _("This content view has on-demand repositories that cannot be exported: %{repos}" % {repos: repos.pluck(:label).join(", ")}) | |||
There was a problem hiding this comment.
nitpick: Since hammer/UI refer to this as on demand, can we remove the hyphen?
|
@cfouant Thanks for the review! Good call for on demand, didn't notice the hyphen. Updated |
|
ACK thanks @stbenjam ! |
|
Thanks @cfouant ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Prevents exporting content views with on demand repositories: