Supplement changes from YCC #148
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
lslezak
reviewed
Jan 28, 2020
build-tools/scripts/y2metainfo
Outdated
| @@ -60,7 +60,8 @@ def metainfo_gen(desktop, license, url, version) | |||
| name.add_attribute("xml:lang", lang) if lang | |||
| end | |||
| cat = base.add_element("categories") | |||
| data["Categories"].split(";").each do |category| | |||
| rejected_categories = ["Settings", "ConsoleOnly", "DesktopSettings"] | |||
| data["Categories"].split(";").reject{ |c| rejected_categories.include?(c) }.each do |category| | |||
There was a problem hiding this comment.
Maybe
rejected_categories = ["Settings", "ConsoleOnly", "DesktopSettings"]
categories = data["Categories"].split(";") - rejected_categories
categories.each do |category|would be a bit more readable...
|
I will add changelog and bump version in separate PR and merge this one. |
jreidinger
approved these changes
Oct 4, 2020
|
✔️ Public Jenkins job #19 successfully finished |
Merged
|
✔️ Internal Jenkins job #9 successfully finished |
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.
Continuation to yast/yast-control-center#43
Appstream builder now has to be able to find the
.desktopversion of ycc and other modules. It also rejects anything containing the listed categories.