From d062a7c0c1cde3179022e124d81b7b824915398e Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Mon, 12 Feb 2018 17:56:29 -0600 Subject: [PATCH] pkglistgen: expose pkglistgen-product-family-last config option. --- pkglistgen.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkglistgen.py b/pkglistgen.py index f50645f0..8f505405 100755 --- a/pkglistgen.py +++ b/pkglistgen.py @@ -1169,9 +1169,10 @@ class CommandLineInterface(ToolBase.CommandLineInterface): # Ensure solv files from all releases in product family are updated. print('-> solv_cache_update') cache_dir_solv = save_cache_path('opensuse-packagelists', 'solv') + family_last = target_config.get('pkglistgen-product-family-last') family_include = target_config.get('pkglistgen-product-family-include') solv_prior = self.solv_cache_update( - apiurl, cache_dir_solv, target_project, family_include, opts) + apiurl, cache_dir_solv, target_project, family_last, family_include, opts) # Include pre-final release solv files for target project. These # files will only exist from previous runs. @@ -1211,11 +1212,12 @@ class CommandLineInterface(ToolBase.CommandLineInterface): self.build_stub(release_dir, 'spec') self.commit_package(release_dir) - def solv_cache_update(self, apiurl, cache_dir_solv, target_project, 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.""" prior = set() - project_family = project_list_family_prior(apiurl, target_project, include_self=True) + project_family = project_list_family_prior( + apiurl, target_project, include_self=True, last=family_last) if family_include: # Include projects from a different family if desired. project_family.extend(project_list_family(apiurl, family_include))