28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From 7e779aa90fbc67a8353b214f0308f25d0aeac188 Mon Sep 17 00:00:00 2001
|
|
From: Lubomír Sedlář <lsedlar@redhat.com>
|
|
Date: Jan 18 2024 09:07:17 +0000
|
|
Subject: ostree_container: Use unique temporary directory
|
|
|
|
|
|
The config repository is cloned into a path that conflicts with the
|
|
regular ostree phase. Let's use a unique name to avoid that problem.
|
|
|
|
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
|
|
|
|
---
|
|
|
|
diff --git a/pungi/phases/ostree_container.py b/pungi/phases/ostree_container.py
|
|
index bd2fd4e..18add3d 100644
|
|
--- a/pungi/phases/ostree_container.py
|
|
+++ b/pungi/phases/ostree_container.py
|
|
@@ -70,7 +70,7 @@ class OSTreeContainerThread(WorkerThread):
|
|
def worker(self, compose, variant, arch, config):
|
|
msg = "OSTree phase for variant %s, arch %s" % (variant.uid, arch)
|
|
self.pool.log_info("[BEGIN] %s" % msg)
|
|
- workdir = compose.paths.work.topdir("ostree-%d" % self.num)
|
|
+ workdir = compose.paths.work.topdir("ostree-container-%d" % self.num)
|
|
self.logdir = compose.paths.log.topdir(
|
|
"%s/%s/ostree-container-%d" % (arch, variant.uid, self.num)
|
|
)
|
|
|