From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 22 Apr 2023 17:12:42 +0000 (+0200)
Subject: Use uid, gid directly instead of state.uid, state.gid
X-Git-Tag: v15~207^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2f8048d8e3823d2c1de285b7a24498be471f9ac;p=thirdparty%2Fmkosi.git

Use uid, gid directly instead of state.uid, state.gid
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 0899115aa..c798db96b 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1670,23 +1670,23 @@ def build_stuff(uid: int, gid: int, config: MkosiConfig) -> None:
         save_manifest(state, manifest)
 
         if state.config.cache_dir:
-            acl_toggle_remove(state.config, state.config.cache_dir, state.uid, allow=True)
+            acl_toggle_remove(state.config, state.config.cache_dir, uid, allow=True)
 
         for p in state.config.output_paths():
             if state.staging.joinpath(p.name).exists():
                 shutil.move(state.staging / p.name, p)
                 if p != state.config.output or state.config.output_format != OutputFormat.directory:
-                    os.chown(p, state.uid, state.gid)
+                    os.chown(p, uid, gid)
                 else:
                     acl_toggle_remove(state.config, p, uid, allow=True)
                 if p == state.config.output:
-                    compress_output(state.config, p, uid=state.uid, gid=state.gid)
+                    compress_output(state.config, p, uid=uid, gid=gid)
 
         for p in state.staging.iterdir():
             shutil.move(p, state.config.output.parent / p.name)
-            os.chown(state.config.output.parent / p.name, state.uid, state.gid)
+            os.chown(state.config.output.parent / p.name, uid, gid)
             if p.name.startswith(state.config.output.name):
-                compress_output(state.config, p, uid=state.uid, gid=state.gid)
+                compress_output(state.config, p, uid=uid, gid=gid)
 
     print_output_size(config)