ostree_container: Use unique temporary directory

(cherry picked from commit 58ca2a86231e53cc329e3e20294853230fabf587)

1711.patch

@@ -0,0 +1,27 @@
+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)
+         )
+

pungi.spec

@@ -2,12 +2,13 @@
 
 Name:           pungi
 Version:        4.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Distribution compose tool
 
 License:        GPL-2.0-only
 URL:            https://pagure.io/pungi
 Source0:        %{name}-%{version}.tar.bz2
+Patch1:         https://pagure.io/pungi/pull-request/1711.patch
 
 BuildRequires:  make
 BuildRequires:  python3-pytest
@@ -165,6 +166,9 @@ rm %{buildroot}%{_bindir}/pungi
 %{_bindir}/%{name}-cache-cleanup
 
 %changelog
+* Thu Jan 18 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.0-2
+- ostree_container: Use unique temporary directory
+
 * Wed Dec 13 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.0-1
 - Add ostree container to image metadata (lsedlar)
 - Updates for ostree-container phase (lsedlar)