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

LNX-311: Add ability to productmd set a main variant while dumping TreeInfo

Browse Source 
@BS-NOBUILD
@BS-TARGET-CL8
@BS-LINKED-608ab56299ce8ac801a396c5  # python3-productmd

Change-Id: Id86d627ae8ae0b9a73b5ce6531c20538f3d040b1
This commit is contained in:
stepan_oksanichenko 2021-04-29 16:46:37 +03:00
parent ebf028ca3b
commit b9f554bf39
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pungi.spec
View File

@ -1,7 +1,7 @@
%{?python_enable_dependency_generator} %{?python_enable_dependency_generator}
Name: pungi Name: pungi
Version: 4.2.10 Version: 4.2.11
Release: 1%{?dist}.cloudlinux Release: 1%{?dist}.cloudlinux
Summary: Distribution compose tool Summary: Distribution compose tool
@ -16,7 +16,7 @@ BuildRequires: python3-pyfakefs
BuildRequires: python3-ddt BuildRequires: python3-ddt
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
BuildRequires: python3-productmd >= 1.23 BuildRequires: python3-productmd >= 1.33
BuildRequires: python3-kobo-rpmlib >= 0.18.0 BuildRequires: python3-kobo-rpmlib >= 0.18.0
BuildRequires: createrepo_c BuildRequires: createrepo_c
BuildRequires: python3-lxml BuildRequires: python3-lxml
@ -45,6 +45,7 @@ BuildRequires: python3-dataclasses
BuildRequires: python3-sphinx BuildRequires: python3-sphinx
Requires: python3-kobo-rpmlib >= 0.18.0 Requires: python3-kobo-rpmlib >= 0.18.0
Requires: python3-productmd >= 1.33
Requires: python3-kickstart Requires: python3-kickstart
Requires: python3-requests Requires: python3-requests
Requires: python3-dataclasses Requires: python3-dataclasses

2
pungi/phases/extra_isos.py
View File

@ -303,7 +303,7 @@ def tweak_repo_treeinfo(compose, include_variants, source_file, dest_file):
var.arch, var.arch,
'os', 'os',
) )
ti.dump(dest_file) ti.dump(dest_file, main_variant=main_variant)
def tweak_treeinfo(compose, include_variants, source_file, dest_file): def tweak_treeinfo(compose, include_variants, source_file, dest_file):

2
setup.py
View File

@ -25,7 +25,7 @@ packages = sorted(packages)
setup( setup(
name="pungi", name="pungi",
version="4.2.10", version="4.2.11",
description="Distribution compose tool", description="Distribution compose tool",
url="https://pagure.io/pungi", url="https://pagure.io/pungi",
author="Dennis Gilmore", author="Dennis Gilmore",

6
tests/fixtures/extraiso-tweaked-expected.treeinfo vendored
View File

@ -7,11 +7,11 @@ images/boot.iso = sha256:fc8a4be604b6425746f12fa706116eb940f93358f036b8fbbe518b5
arch = x86_64 arch = x86_64
family = Test family = Test
name = Test 1.0 name = Test 1.0
packagedir = ../../../Client/x86_64/os/Packages packagedir = Packages
platforms = x86_64,xen platforms = x86_64,xen
repository = ../../../Client/x86_64/os repository = .
timestamp = 1531881582 timestamp = 1531881582
variant = Client variant = Server
variants = Client,Server variants = Client,Server
version = 1.0 version = 1.0