add a workaround for missing user= parameter in subprocess.run on python 3.8

Fixes: #967

diff --git a/mkosi/backend.py b/mkosi/backend.py
index 2f35b065dff5c2bd0422e41e3877fdc3439633ae..56db6839a407d108ee827439c724b6889bc08b42 100644 (file)
--- a/mkosi/backend.py
+++ b/mkosi/backend.py
@@ -764,6 +764,14 @@ def run(
         # output.
         stdout = sys.stderr
 
+    # This is a workaround for copy_git_files, which uses the user= option to
+    # subprocess.run, which is only available starting with Python 3.9
+    # TODO: remove this branch once mkosi defaults to at least Python 3.9
+    if "user" in kwargs and sys.version_info < (3, 9):
+        user = kwargs.pop("user")
+        user = f"#{user}" if isinstance(user, int) else user
+        cmdline = ["sudo", "-u", user] + cmdline
+
     cm = do_delay_interrupt if delay_interrupt else do_noop
     try:
         with cm():