]> git.proxmox.com Git - mirror_qemu.git/commitdiff
tests/docker: Fix _get_so_libs() for docker-binfmt-image
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tue, 2 Feb 2021 13:39:46 +0000 (13:39 +0000)
committerAlex Bennée <alex.bennee@linaro.org>
Mon, 8 Feb 2021 09:41:00 +0000 (09:41 +0000)
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>
Message-Id: <20210202134001.25738-2-alex.bennee@linaro.org>

tests/docker/docker.py

index 884dfeb29c4fb4f62f44959bb8e282b8bac8bb29..0b4f6167b3db73a2e9f9c4ceddf507e7ee5d9fd9 100755 (executable)
@@ -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: