From 284d3a351032db7c341c50441a7752f8157c07a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Mon, 15 Feb 2016 09:03:34 +0100 Subject: [PATCH] [image-build] Use dashes as arch separator in log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since multiple images are created in a single Koji task, the path to log file contains a list of arches. These used to be separated with comma. For consistency with live-media they are now separated by dashes. Signed-off-by: Lubomír Sedlář --- pungi/phases/image_build.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pungi/phases/image_build.py b/pungi/phases/image_build.py index 748a7bed..b7f4998d 100644 --- a/pungi/phases/image_build.py +++ b/pungi/phases/image_build.py @@ -153,14 +153,15 @@ class CreateImageBuildThread(WorkerThread): def worker(self, num, compose, cmd): arches = cmd["image_conf"]["image-build"]['arches'].split(',') + dash_arches = '-'.join(arches) log_file = compose.paths.log.log_file( - cmd["image_conf"]["image-build"]["arches"], - "imagebuild-%s-%s-%s" % ('-'.join(arches), + dash_arches, + "imagebuild-%s-%s-%s" % (dash_arches, cmd["image_conf"]["image-build"]["variant"], cmd["image_conf"]["image-build"]['format'].replace(",", "-")) ) msg = "Creating %s image (arches: %s, variant: %s)" % (cmd["image_conf"]["image-build"]["format"].replace(",", "-"), - '-'.join(arches), + dash_arches, cmd["image_conf"]["image-build"]["variant"]) self.pool.log_info("[BEGIN] %s" % msg) @@ -168,7 +169,7 @@ class CreateImageBuildThread(WorkerThread): # writes conf file for koji image-build self.pool.log_info("Writing image-build config for %s.%s into %s" % ( - cmd["image_conf"]["image-build"]["variant"], '-'.join(arches), cmd["conf_file"])) + cmd["image_conf"]["image-build"]["variant"], dash_arches, cmd["conf_file"])) koji_cmd = koji_wrapper.get_image_build_cmd(cmd["image_conf"], conf_file_dest=cmd["conf_file"], scratch=cmd['scratch'])