diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-03-06 16:27:43 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2023-03-13 15:39:31 +0400 |
| commit | e387ef472f661657df67574e337f0558424f836a (patch) | |
| tree | 208bcaaea257ee4d57c24f46d1099b7c2b253a08 | |
| parent | 8467936e3df3484b4931576a72ae760a1610f022 (diff) | |
| download | qemu-e387ef472f661657df67574e337f0558424f836a.zip qemu-e387ef472f661657df67574e337f0558424f836a.tar.gz qemu-e387ef472f661657df67574e337f0558424f836a.tar.bz2 | |
tests/docker: fix a win32 error due to portability
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>
| -rwxr-xr-x | tests/docker/docker.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 3a1ed7c..688ef62 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -23,10 +23,10 @@ import enum import tempfile import re import signal +import getpass from tarfile import TarFile, TarInfo from io import StringIO, BytesIO from shutil import copy, rmtree -from pwd import getpwuid from datetime import datetime, timedelta @@ -316,7 +316,7 @@ class Docker(object): if user: uid = os.getuid() - uname = getpwuid(uid).pw_name + uname = getpass.getuser() tmp_df.write("\n") tmp_df.write("RUN id %s 2>/dev/null || useradd -u %d -U %s" % (uname, uid, uname)) @@ -570,7 +570,7 @@ class UpdateCommand(SubCommand): if args.user: uid = os.getuid() - uname = getpwuid(uid).pw_name + uname = getpass.getuser() df.write("\n") df.write("RUN id %s 2>/dev/null || useradd -u %d -U %s" % (uname, uid, uname)) |