From 8ef2e7e30874f32bcc59057b3cc1add352639e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Thu, 11 Feb 2016 13:58:42 +0100 Subject: [PATCH] [live-media] Properly calculate iso dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The method expects to be called with a arch, not just variant. Signed-off-by: Lubomír Sedlář --- pungi/phases/livemedia_phase.py | 4 ++-- tests/test_livemediaphase.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pungi/phases/livemedia_phase.py b/pungi/phases/livemedia_phase.py index e895fd35..fa811020 100644 --- a/pungi/phases/livemedia_phase.py +++ b/pungi/phases/livemedia_phase.py @@ -170,10 +170,10 @@ class LiveMediaThread(WorkerThread): linker = Linker(logger=compose._logger) link_type = compose.conf.get("link_type", "hardlink-or-copy") for image_info in image_infos: - image_dir = compose.paths.compose.iso_dir(variant) % {"arch": image_info['arch']} + image_dir = compose.paths.compose.iso_dir(image_info['arch'], variant) makedirs(image_dir) relative_image_dir = ( - compose.paths.compose.iso_dir(variant, relative=True) % {"arch": image_info['arch']} + compose.paths.compose.iso_dir(image_info['arch'], variant, relative=True) ) # let's not change filename of koji outputs diff --git a/tests/test_livemediaphase.py b/tests/test_livemediaphase.py index fb8e9f24..0c4b982f 100755 --- a/tests/test_livemediaphase.py +++ b/tests/test_livemediaphase.py @@ -36,8 +36,8 @@ class _DummyCompose(object): side_effect=lambda arch, variant, create_dir=False: os.path.join('/repo', arch, variant.uid) ), iso_dir=mock.Mock( - side_effect=lambda variant, relative=False: os.path.join( - '' if relative else '/', 'iso_dir', variant.uid, '%(arch)s' + side_effect=lambda arch, variant, relative=False: os.path.join( + '' if relative else '/', 'iso_dir', variant.uid, arch ) ) ),