almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

LNX-326: Add the ability to include any package by mask in packages.json to the generator

Browse Source 
- The reference packages should be replaced only by the newer reference packages
- The non-reference packages should be replaced by both of types packages

@BS-NOBUILD
@BS-TARGET-CL8

Change-Id: I881bd4e58527ae219ef6e1adbc6332b3b05933c1
This commit is contained in:
stepan_oksanichenko 2021-06-18 14:23:42 +03:00
parent 084321dd97
commit 14dd6a195f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pungi/scripts/create_packages_json.py
View File

@ -295,9 +295,13 @@ class PackagesGenerator:
all_packages[package_key]['variant'] = repo_info.name all_packages[package_key]['variant'] = repo_info.name
all_packages[package_key]['arch'] = repo_info.arch all_packages[package_key]['arch'] = repo_info.arch
all_packages[package_key]['package'] = package all_packages[package_key]['package'] = package
elif not repo_info.is_reference: all_packages[package_key]['type'] = repo_info.is_reference
continue # replace an older package if it's not reference or
elif self.compare_pkgs_version( # a newer package is from reference repo
elif (not all_packages[package_key]['type'] or
all_packages[package_key]['type'] ==
repo_info.is_reference) and \
self.compare_pkgs_version(
package, package,
all_packages[package_key]['package'] all_packages[package_key]['package']
) > 0: ) > 0: