From b9f554bf39db1545050756e139f45a441ddfb672 Mon Sep 17 00:00:00 2001
From: stepan_oksanichenko <soksanichenko@cloudlinux.com>
Date: Thu, 29 Apr 2021 16:46:37 +0300
Subject: [PATCH] LNX-311: Add ability to productmd set a main variant while
 dumping TreeInfo

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

Change-Id: Id86d627ae8ae0b9a73b5ce6531c20538f3d040b1
---
 pungi.spec                                        | 5 +++--
 pungi/phases/extra_isos.py                        | 2 +-
 setup.py                                          | 2 +-
 tests/fixtures/extraiso-tweaked-expected.treeinfo | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pungi.spec b/pungi.spec
index 00d67467..425c9e02 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -1,7 +1,7 @@
 %{?python_enable_dependency_generator}
 
 Name:           pungi
-Version:        4.2.10
+Version:        4.2.11
 Release:        1%{?dist}.cloudlinux
 Summary:        Distribution compose tool
 
@@ -16,7 +16,7 @@ BuildRequires:  python3-pyfakefs
 BuildRequires:  python3-ddt
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-BuildRequires:  python3-productmd >= 1.23
+BuildRequires:  python3-productmd >= 1.33
 BuildRequires:  python3-kobo-rpmlib >= 0.18.0
 BuildRequires:  createrepo_c
 BuildRequires:  python3-lxml
@@ -45,6 +45,7 @@ BuildRequires:  python3-dataclasses
 BuildRequires:  python3-sphinx
 
 Requires:       python3-kobo-rpmlib >= 0.18.0
+Requires:       python3-productmd >= 1.33
 Requires:       python3-kickstart
 Requires:       python3-requests
 Requires:       python3-dataclasses
diff --git a/pungi/phases/extra_isos.py b/pungi/phases/extra_isos.py
index 8874cbe1..4f561953 100644
--- a/pungi/phases/extra_isos.py
+++ b/pungi/phases/extra_isos.py
@@ -303,7 +303,7 @@ def tweak_repo_treeinfo(compose, include_variants, source_file, dest_file):
                 var.arch,
                 'os',
             )
-    ti.dump(dest_file)
+    ti.dump(dest_file, main_variant=main_variant)
 
 
 def tweak_treeinfo(compose, include_variants, source_file, dest_file):
diff --git a/setup.py b/setup.py
index 99116d0f..2a8228db 100755
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ packages = sorted(packages)
 
 setup(
     name="pungi",
-    version="4.2.10",
+    version="4.2.11",
     description="Distribution compose tool",
     url="https://pagure.io/pungi",
     author="Dennis Gilmore",
diff --git a/tests/fixtures/extraiso-tweaked-expected.treeinfo b/tests/fixtures/extraiso-tweaked-expected.treeinfo
index 666a03c2..91f7d74a 100644
--- a/tests/fixtures/extraiso-tweaked-expected.treeinfo
+++ b/tests/fixtures/extraiso-tweaked-expected.treeinfo
@@ -7,11 +7,11 @@ images/boot.iso = sha256:fc8a4be604b6425746f12fa706116eb940f93358f036b8fbbe518b5
 arch = x86_64
 family = Test
 name = Test 1.0
-packagedir = ../../../Client/x86_64/os/Packages
+packagedir = Packages
 platforms = x86_64,xen
-repository = ../../../Client/x86_64/os
+repository = .
 timestamp = 1531881582
-variant = Client
+variant = Server
 variants = Client,Server
 version = 1.0