From nobody Mon Feb 9 11:01:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) client-ip=209.85.218.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1611032514; cv=none; d=zohomail.com; s=zohoarc; b=SIvGGkacBuna19u3O3n1Pei/EgX7VoRu6tr3ZPAllAClxIeigl0AQYGVLfW4w6B2yhg7btACCRUuAMBoZud2paR+QXqeGShManLXBvcy4+cMnLkAwJ4ZmJijmRJLooOadBZpzVBtZdVpk+P2pATcZr5Eb/DdllKTc3vOokNmy54= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611032514; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=QlhtV/Zy66bhXE98ce4juGehMD6LZDiEqXX3BRf4JbA=; b=IEKMU7aZOLW2hp2IcNJ3NjdkLtcGqUVUVmKChn3KRizVPCchd2fBdrwshulmzYC5kUhvftX8UoFZDdAMMGJWvZwF2RGVFQkFxLGlGzMNyxHGtAHjCiE4Zjy6NHSUHveTZOboz1cKxy7llXpcAR/TBPSDp9aIdqnrJdPmPv0xqtk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by mx.zohomail.com with SMTPS id 161103251417147.01080747001845; Mon, 18 Jan 2021 21:01:54 -0800 (PST) Received: by mail-ej1-f53.google.com with SMTP id w1so26653058ejf.11 for ; Mon, 18 Jan 2021 21:01:53 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id m9sm11763637edd.18.2021.01.18.21.01.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 21:01:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QlhtV/Zy66bhXE98ce4juGehMD6LZDiEqXX3BRf4JbA=; b=CekrRf2TY3pM3wmXJDz24cW2vn5JAJq42dZjVxDMxMRWL7ZGP9kT1XTJP/UP/kx021 LmyzQ+EsqTMyyR011jTvOkj7b0c62qBt6vcPTZeq9DzxHdCDlPFkCzWnqF0/SzlMHYgn tu4mN2fgM8Pg3wfgxMXJbp84v6SiOsrH58KyfhUtQD6F2Ac8WuFVPaBkHprzfWIdRBUp 5KT3yE9qRQoGoi50669hH9cNyKKxXjGjSSMeFyDy4S/13wMDHe2yFSTb3s/TkR4hk2d0 eKld6aqKZtwU1ilni9bpDH6cNRfu+36Xrc6HRtS1baxHxidC0iJy04I1T/8StHZnL+4N 3Rxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=QlhtV/Zy66bhXE98ce4juGehMD6LZDiEqXX3BRf4JbA=; b=uobXJwYpMGHC0ZHKsl+I6F1jrQe0ML+bRJnjA5Ogw5iNtcbOMMU7QmXhspDaQVLTss sqV7SueHcjl0NYa++YldjQp+dkM7QtaDncsX7k1fiBto1NhDkHKQgKSagBqX39jREfmM BTcs98cSjoVwAmxhp12wQF2DZJZoGEzC0zCFK4lfahDNu35veZNhF2dKnl/0x2Zkpz+E rl2EWki0Aqn+CNc2X5/Ik8mJUG9uEdstOFbI5xI6B77j51dqKGi9j5rZzIvKlW7wY3kP 2uHgzBTcsuF0OUO64Pn9LIaED3aGFKMwRlslUDu8LeQDychhPIBolQX/y+Vl0lC9zSB1 fxcg== X-Gm-Message-State: AOAM530p0yatRg899hF5FmahEIyeEukaQ+UmXnaU6Qs7FIrGcDA/1OI2 g1MxDb9UG7IqDhIyJQ/OaGw= X-Google-Smtp-Source: ABdhPJwMwV87b+TpBZcgwwhXWuHcS2oEHIoOHr88w8gCjeXGOX6e2ZtPgtdoiqBdB3DxZlxJh15K6g== X-Received: by 2002:a17:906:b0d2:: with SMTP id bk18mr1735701ejb.508.1611032512352; Mon, 18 Jan 2021 21:01:52 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Fam Zheng , Laurent Vivier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] tests/docker: Fix _get_so_libs() for docker-binfmt-image Date: Tue, 19 Jan 2021 06:01:49 +0100 Message-Id: <20210119050149.516910-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Fix a variable rename mistake from commit 5e33f7fead5: Traceback (most recent call last): File "./tests/docker/docker.py", line 710, in 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 =3D _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=C3=A9 --- "Tested-by" but apparently not enough... Well actually it was on Debian, now using Fedora. --- 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 =3D ldd_re.search(line) if search: try: - libs.append(s.group(1)) + libs.append(search.group(1)) except IndexError: pass except subprocess.CalledProcessError: --=20 2.26.2