From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 23 Mar 2025 14:25:25 +0000 (+0100)
Subject: user: Replace INVOKING_USER.name() with getpass.getuser()
X-Git-Tag: v26~305^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86ff031b5a2be36a0cd2ef7dcb6affa9dc5d6fbf;p=thirdparty%2Fmkosi.git

user: Replace INVOKING_USER.name() with getpass.getuser()
---

diff --git a/mkosi/config.py b/mkosi/config.py
index ee140e873..a54144d05 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -7,6 +7,7 @@ import dataclasses
 import enum
 import fnmatch
 import functools
+import getpass
 import graphlib
 import inspect
 import io
@@ -4239,7 +4240,7 @@ def create_argument_parser(chdir: bool = True) -> argparse.ArgumentParser:
         "--genkey-common-name",
         metavar="CN",
         help="Template for the CN when generating keys",
-        default=f"mkosi of {INVOKING_USER.name()}",
+        default=f"mkosi of {getpass.getuser()}",
     )
     parser.add_argument(
         "-B",
diff --git a/mkosi/user.py b/mkosi/user.py
index 3daafc92d..1550fd5aa 100644
--- a/mkosi/user.py
+++ b/mkosi/user.py
@@ -14,19 +14,6 @@ SUBRANGE = 65536
 
 
 class INVOKING_USER:
-    @classmethod
-    def name(cls) -> str:
-        try:
-            return pwd.getpwuid(os.getuid()).pw_name
-        except KeyError:
-            if os.getuid() == 0:
-                return "root"
-
-            if not (user := os.getenv("USER")):
-                die(f"Could not find user name for UID {os.getuid()}")
-
-            return user
-
     @classmethod
     def is_regular_user(cls, uid: int) -> bool:
         return uid >= 1000