From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 9 May 2023 09:56:35 +0000 (+0200)
Subject: Only try to apply ACL to image output if it's a directory
X-Git-Tag: v15~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4408cac85eaedd7c2062bc453ed7b536cae44e9b;p=thirdparty%2Fmkosi.git

Only try to apply ACL to image output if it's a directory
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index dffbc3702..e0089a5aa 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1802,9 +1802,13 @@ def acl_toggle_build(state: MkosiState) -> Iterator[None]:
             if p and p.is_dir():
                 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:
-                stack.enter_context(acl_maybe_toggle(state.config, p, state.uid, always=True))
+        if state.config.cache_dir:
+            stack.enter_context(acl_maybe_toggle(state.config, state.config.cache_dir, state.uid, always=True))
+
+        if state.config.output_format == OutputFormat.directory:
+            stack.enter_context(acl_maybe_toggle(state.config,
+                                                 state.config.output_dir / state.config.output,
+                                                 state.uid, always=True))
 
         yield