From 92ccaeebe0c7f47a15d192bcc789cf5d49f06a81 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Fri, 15 Sep 2023 13:01:23 +0200
Subject: [PATCH] podman: don't affect --shell stdout with `podman image umout`

The `podman image umount` actually dumps the image ID to stdout.

Complements: b626045d2bdde026e0278dd1971ed54b217cc7af
Closes: #1218
---
 mock/py/mockbuild/podman.py                           | 2 +-
 releng/release-notes-next/podman-image-unmount.bugfix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 releng/release-notes-next/podman-image-unmount.bugfix

diff --git a/mock/py/mockbuild/podman.py b/mock/py/mockbuild/podman.py
index 278544bf3..44b046add 100644
--- a/mock/py/mockbuild/podman.py
+++ b/mock/py/mockbuild/podman.py
@@ -101,7 +101,7 @@ def mounted_image(self):
         finally:
             logger.info("umounting image %s (%s) with podman image umount",
                         self.image, mountpoint)
-            subprocess.run(cmd_umount, check=True)
+            subprocess.run(cmd_umount, capture_output=True, check=True)
 
     @traceLog()
     def cp(self, destination, tar_cmd):
diff --git a/releng/release-notes-next/podman-image-unmount.bugfix b/releng/release-notes-next/podman-image-unmount.bugfix
new file mode 100644
index 000000000..a2f037fac
--- /dev/null
+++ b/releng/release-notes-next/podman-image-unmount.bugfix
@@ -0,0 +1,2 @@
+The `--shell` standard output is no longer affected by `podman image unmount`
+output executed in the background (prints out the image ID).