motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 02:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/docker: fix a win32 error due to portability

Browse source 
docker.py is run during configure, and produces an error: No module
named 'pwd'.

Use a more portable and recommended alternative to lookup the user
"login name".

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230306122751.2355515-4-marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2023-03-06 16:27:43 +04:00
parent 8467936e3d
commit e387ef472f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/docker/docker.py
View file

@ -23,10 +23,10 @@ import enum
import tempfile import tempfile
import re import re
import signal import signal
import getpass
from tarfile import TarFile, TarInfo from tarfile import TarFile, TarInfo
from io import StringIO, BytesIO from io import StringIO, BytesIO
from shutil import copy, rmtree from shutil import copy, rmtree
from pwd import getpwuid
from datetime import datetime, timedelta from datetime import datetime, timedelta
@ -316,7 +316,7 @@ class Docker(object):
if user: if user:
uid = os.getuid() uid = os.getuid()
uname = getpwuid(uid).pw_name uname = getpass.getuser()
tmp_df.write("\n") tmp_df.write("\n")
tmp_df.write("RUN id %s 2>/dev/null || useradd -u %d -U %s" % tmp_df.write("RUN id %s 2>/dev/null || useradd -u %d -U %s" %
(uname, uid, uname)) (uname, uid, uname))
@ -570,7 +570,7 @@ class UpdateCommand(SubCommand):
if args.user: if args.user:
uid = os.getuid() uid = os.getuid()
uname = getpwuid(uid).pw_name uname = getpass.getuser()
df.write("\n") df.write("\n")
df.write("RUN id %s 2>/dev/null || useradd -u %d -U %s" % df.write("RUN id %s 2>/dev/null || useradd -u %d -U %s" %
(uname, uid, uname)) (uname, uid, uname))