All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: "Fam Zheng" <fam@euphon.net>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	qemu-devel@nongnu.org, "Laurent Vivier" <laurent@vivier.eu>
Subject: Re: [PATCH] tests/docker: Fix _get_so_libs() for docker-binfmt-image
Date: Tue, 19 Jan 2021 11:21:47 +0000	[thread overview]
Message-ID: <87eeihuq70.fsf@linaro.org> (raw)
In-Reply-To: <20210119050149.516910-1-f4bug@amsat.org>


Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> 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>
> ---
> "Tested-by" but apparently not enough... Well actually it was on
> Debian, now using Fedora.

Also we don't notice if we use static binaries (which I do most of the time).

Queued to testing/next, thanks.

> ---
>  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 884dfeb29c4..0b4f6167b3d 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:


-- 
Alex Bennée


      reply	other threads:[~2021-01-19 11:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-19  5:01 [PATCH] tests/docker: Fix _get_so_libs() for docker-binfmt-image Philippe Mathieu-Daudé
2021-01-19 11:21 ` Alex Bennée [this message]

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=87eeihuq70.fsf@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=f4bug@amsat.org \
    --cc=fam@euphon.net \
    --cc=laurent@vivier.eu \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.