From b181b0803351e559189d9751635bda3ce558cff1 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 6 Mar 2024 10:38:45 -0800 Subject: [PATCH] image_build: accept Kiwi vagrant image name format According to Neal, Vagrant images produced by Kiwi end in e.g. `vagrant.libvirt.box` and `vagrant.virtualbox.box` - with a period between `vagrant` and the image type, not a dash as with oz. We should accept this slightly different format so we can correctly derive the productmd `type` and `format` for these. Signed-off-by: Adam Williamson (cherry picked from commit 93b4b4ae0faba17774690a24f0750eefe06e9c75) --- pungi/phases/image_build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pungi/phases/image_build.py b/pungi/phases/image_build.py index cb76c1aa..e1efba32 100644 --- a/pungi/phases/image_build.py +++ b/pungi/phases/image_build.py @@ -34,8 +34,8 @@ EXTENSIONS = { "rhevm-ova": ["rhevm.ova"], "tar-gz": ["tar.gz"], "vagrant-hyperv": ["vagrant-hyperv.box"], - "vagrant-libvirt": ["vagrant-libvirt.box"], - "vagrant-virtualbox": ["vagrant-virtualbox.box"], + "vagrant-libvirt": ["vagrant-libvirt.box", "vagrant.libvirt.box"], + "vagrant-virtualbox": ["vagrant-virtualbox.box", "vagrant.virtualbox.box"], "vagrant-vmware-fusion": ["vagrant-vmware-fusion.box"], "vdi": ["vdi"], "vmdk": ["vmdk"],