From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH v2 1/8] tests/docker: Fix _get_so_libs() for docker-binfmt-image
Date: Fri, 22 Jan 2021 18:18:47 +0000 [thread overview]
Message-ID: <20210122181854.23105-2-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210122181854.23105-1-alex.bennee@linaro.org>
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Fix a variable rename mistake from commit 5e33f7fead5:
Traceback (most recent call last):
File "./tests/docker/docker.py", line 710, in <module>
sys.exit(main())
File "./tests/docker/docker.py", line 706, in main
return args.cmdobj.run(args, argv)
File "./tests/docker/docker.py", line 489, in run
_copy_binary_with_libs(args.include_executable,
File "./tests/docker/docker.py", line 149, in _copy_binary_with_libs
libs = _get_so_libs(src)
File "./tests/docker/docker.py", line 123, in _get_so_libs
libs.append(s.group(1))
NameError: name 's' is not defined
Fixes: 5e33f7fead5 ("tests/docker: better handle symlinked libs")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210119050149.516910-1-f4bug@amsat.org>
---
tests/docker/docker.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 884dfeb29c..0b4f6167b3 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -120,7 +120,7 @@ def _get_so_libs(executable):
search = ldd_re.search(line)
if search:
try:
- libs.append(s.group(1))
+ libs.append(search.group(1))
except IndexError:
pass
except subprocess.CalledProcessError:
--
2.20.1
next prev parent reply other threads:[~2021-01-22 18:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 18:18 [PATCH v2 0/8] testing/next (docker, binfmt, gdb version) Alex Bennée
2021-01-22 18:18 ` Alex Bennée [this message]
2021-01-22 18:18 ` [PATCH v2 2/8] tests/docker: Fix typo in help message Alex Bennée
2021-01-22 18:18 ` [PATCH v2 3/8] tests/docker: make _copy_with_mkdir accept missing files Alex Bennée
2021-01-22 18:18 ` [PATCH v2 4/8] tests/docker: preserve original name when copying libs Alex Bennée
2021-01-22 18:18 ` [PATCH v2 5/8] tests/docker: alias docker-help target for consistency Alex Bennée
2021-01-29 15:49 ` Thomas Huth
2021-01-22 18:18 ` [PATCH v2 6/8] tests/docker: add a docker-exec-copy-test Alex Bennée
2021-01-22 18:18 ` [PATCH v2 7/8] configure: make version_ge more tolerant of shady version input Alex Bennée
2021-01-29 15:46 ` Thomas Huth
2021-01-22 18:18 ` [PATCH v2 8/8] configure: bump the minimum gdb version for check-tcg to 9.1 Alex Bennée
2021-01-29 15:20 ` [PATCH v2 0/8] testing/next (docker, binfmt, gdb version) Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210122181854.23105-2-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).