Merge pull request #1704 from coolo/use_filtered_unsorted

Don't take unsorted.group as reference for SP1 product changes
This commit is contained in:
Stephan Kulow 2018-09-26 10:02:43 +02:00 committed by GitHub
commit 015677fa45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1365,6 +1365,10 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
if api.item_exists(opts.project, '000product-summary'): if api.item_exists(opts.project, '000product-summary'):
summary_str = "# Summary of packages in groups" summary_str = "# Summary of packages in groups"
for group in sorted(summary.keys()): for group in sorted(summary.keys()):
# the unsorted group should appear filtered by
# unneeded.yml - so we need the content of unsorted.yml
# not unsorted.group (this grew a little unnaturally)
if group == 'unsorted': continue
summary_str += "\n" + group + ":\n" summary_str += "\n" + group + ":\n"
for package in sorted(summary[group]): for package in sorted(summary[group]):
summary_str += " - " + package + "\n" summary_str += " - " + package + "\n"
@ -1372,6 +1376,10 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
url = api.makeurl(['source', opts.project, '000product-summary', 'summary.yml']) url = api.makeurl(['source', opts.project, '000product-summary', 'summary.yml'])
http_PUT(url, data=summary_str) http_PUT(url, data=summary_str)
unsorted_yml = open(os.path.join(product_dir, 'unsorted.yml')).read()
url = api.makeurl(['source', opts.project, '000product-summary', 'unsorted.yml'])
http_PUT(url, data=unsorted_yml)
def solv_cache_update(self, apiurl, cache_dir_solv, target_project, family_last, family_include, opts): def solv_cache_update(self, apiurl, cache_dir_solv, target_project, family_last, family_include, opts):
"""Dump solv files (do_dump_solv) for all products in family.""" """Dump solv files (do_dump_solv) for all products in family."""
prior = set() prior = set()