use getuser instead of getlogin

thanks arsen

Signed-off-by: Zen <[email protected]>

Author: desultory

src/zenlib/namespace/namespace.py

@@ -1,4 +1,5 @@
-from os import CLONE_NEWNS, CLONE_NEWUSER, getlogin, unshare, getuid
+from os import CLONE_NEWNS, CLONE_NEWUSER, unshare, getuid
+from getpass import getuser
 from subprocess import CalledProcessError, run
 
 
@@ -7,7 +8,7 @@ def unshare_namespace():
 
 
 def get_id_map(username=None, id_type="uid"):
-    username = username or getlogin()
+    username = username or getuser()
     if id_type not in ("uid", "gid"):
         raise ValueError("id_type must be 'uid' or 'gid'")
 

src/zenlib/namespace/namespace_process.py

@@ -1,5 +1,6 @@
 from multiprocessing import Event, Pipe, Process, Queue
-from os import chroot, chdir, getgid, getlogin, getuid, setgid, setuid
+from os import chroot, chdir, getgid, getuid, setgid, setuid
+from getpass import getuser
 
 from .namespace import get_id_map, new_id_map, unshare_namespace
 
@@ -11,7 +12,7 @@ class NamespaceProcess(Process):
 
     def __init__(self, target=None, args=None, kwargs=None, **ekwargs):
         self.target_root = kwargs.pop("target_root", "/")
-        namespace_user = kwargs.pop("namespace_user", getlogin())
+        namespace_user = kwargs.pop("namespace_user", getuser())
         self.subuid_start, self.subuid_count = get_id_map(namespace_user, "uid")
         self.subgid_start, self.subgid_count = get_id_map(namespace_user, "gid")
         self.orig_uid = getuid()