From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 8 May 2023 20:25:43 +0000 (+0200)
Subject: More ACL fixes
X-Git-Tag: v15~175^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=403b15d5526d91c10f092d09860e53a0e84c8f87;p=thirdparty%2Fmkosi.git

More ACL fixes

Let's make sure we actually add ACLs to directories that initally
don't exist yet.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index db2d5cfde..0e7a721bb 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1735,10 +1735,13 @@ def acl_maybe_toggle(config: MkosiConfig, root: Path, uid: int, *, always: bool)
         return
 
     # getfacl complains about absolute paths so make sure we pass a relative one.
-    has_acl = f"user:{uid}:rwx" in run(["getfacl", "-n", root.relative_to(Path.cwd())], stdout=subprocess.PIPE, text=True).stdout
-    if not has_acl and not always:
-        yield
-        return
+    if root.exists():
+        has_acl = f"user:{uid}:rwx" in run(["getfacl", "-n", root.relative_to(Path.cwd())], stdout=subprocess.PIPE, text=True).stdout
+        if not has_acl and not always:
+            yield
+            return
+    else:
+        has_acl = False
 
     try:
         if has_acl:
@@ -1747,7 +1750,9 @@ def acl_maybe_toggle(config: MkosiConfig, root: Path, uid: int, *, always: bool)
 
         yield
     finally:
-        setfacl(root, uid, allow=True)
+        if has_acl or always:
+            with complete_step(f"Adding ACLs to {root}"):
+                setfacl(root, uid, allow=True)
 
 
 @contextlib.contextmanager
@@ -1765,7 +1770,7 @@ def acl_toggle_build(state: MkosiState) -> Iterator[None]:
                 stack.enter_context(acl_maybe_toggle(state.config, p, state.uid, always=False))
 
         for p in (state.config.cache_dir, state.config.output_dir / state.config.output):
-            if p and p.is_dir():
+            if p:
                 stack.enter_context(acl_maybe_toggle(state.config, p, state.uid, always=True))
 
         yield