From ca7c78d98cf090574405e62063fc03ba6bd3e6cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Tue, 23 Feb 2016 09:41:03 +0100 Subject: [PATCH] [live-images] Set type to raw-xz for appliances MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lubomír Sedlář --- pungi/phases/live_images.py | 2 +- tests/test_liveimagesphase.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pungi/phases/live_images.py b/pungi/phases/live_images.py index 57f5b24b..87b21b73 100644 --- a/pungi/phases/live_images.py +++ b/pungi/phases/live_images.py @@ -280,7 +280,7 @@ class CreateLiveImageThread(WorkerThread): def _add_to_images(self, compose, variant, arch, type, format, path): """Adds the image to images.json""" img = Image(compose.im) - img.type = type + img.type = 'raw-xz' if type == 'appliance' else type img.format = format img.path = os.path.relpath(path, compose.paths.compose.topdir()) img.mtime = get_mtime(path) diff --git a/tests/test_liveimagesphase.py b/tests/test_liveimagesphase.py index a63fe3ef..ccbf6a3d 100755 --- a/tests/test_liveimagesphase.py +++ b/tests/test_liveimagesphase.py @@ -444,7 +444,7 @@ class TestCreateLiveImageThread(PungiTestCase): release=None, ksurl=None)]) - self.assertEqual(Image.return_value.type, 'appliance') + self.assertEqual(Image.return_value.type, 'raw-xz') self.assertEqual(Image.return_value.format, 'raw.xz') self.assertEqual(Image.return_value.path, 'Client/amd64/iso/image-name') self.assertEqual(Image.return_value.size, 1024)