From da590d559ed281618167e2d237fda7466a7af545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Wed, 11 Oct 2017 08:17:17 +0200 Subject: [PATCH] Use variant UID for subvariant fallback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The name can contains spaces, which would potentially cause problems. Also this is not consistent with how it works in other phases. Relates: https://pagure.io/pungi-fedora/pull-request/354 Signed-off-by: Lubomír Sedlář --- pungi/phases/buildinstall.py | 2 +- pungi/phases/ostree_installer.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pungi/phases/buildinstall.py b/pungi/phases/buildinstall.py index 9d805bcd..1bacc160 100644 --- a/pungi/phases/buildinstall.py +++ b/pungi/phases/buildinstall.py @@ -348,7 +348,7 @@ def link_boot_iso(compose, arch, variant, can_fail): img.disc_number = 1 img.disc_count = 1 img.bootable = True - img.subvariant = variant.name + img.subvariant = variant.uid img.implant_md5 = implant_md5 setattr(img, 'can_fail', can_fail) setattr(img, 'deliverable', 'buildinstall') diff --git a/pungi/phases/ostree_installer.py b/pungi/phases/ostree_installer.py index ceb1f038..c20cc5cb 100644 --- a/pungi/phases/ostree_installer.py +++ b/pungi/phases/ostree_installer.py @@ -120,7 +120,7 @@ class OstreeInstallerThread(WorkerThread): img.disc_number = 1 img.disc_count = 1 img.bootable = True - img.subvariant = variant.name + img.subvariant = variant.uid img.implant_md5 = implant_md5 setattr(img, 'can_fail', self.can_fail) setattr(img, 'deliverable', 'ostree-installer')