From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED8E5C433DB for ; Tue, 19 Jan 2021 18:35:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 98F5E22D2A for ; Tue, 19 Jan 2021 18:35:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98F5E22D2A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1viX-00044s-19 for qemu-devel@archiver.kernel.org; Tue, 19 Jan 2021 13:27:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1vAw-00010I-Le for qemu-devel@nongnu.org; Tue, 19 Jan 2021 12:52:19 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:44521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1vAr-0003md-DY for qemu-devel@nongnu.org; Tue, 19 Jan 2021 12:52:18 -0500 Received: by mail-wr1-x42d.google.com with SMTP id w5so20583092wrm.11 for ; Tue, 19 Jan 2021 09:52:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z1pwI3vYS5zF+thwL7KFBLXWBDqCuQgrG7iqQ6JY8Jc=; b=fvUyUXdWTL6Sfy0frqKvjv8x3iXRZ1sJQ+Q4umsxsbdaML8RXBYwGrpsFkpb60pxnC 0+r74lqCa6nInAV+6ceAHfxcIpjN/jF+50NJ2olwuktn3biVLA6aJKB0ksgTrOhx9h0H wRjjK1OIzCG9iDSCXwmiWDbFNTWeBYDu+eyo7aXP0Y33morZBTpZTEagSkT5gz3O8P42 6HqeIvtXN8obsNEu1dXADZpkenHuDn1SgaVziqGPESdZj1X6iLbFonu5/kfFoYHHTdj6 Wwgv2Ou3SrjzTHcVigpK5nxapawpIS5nnAlMGQLN9IZHkvlAwv5Y7N3Dka1rlQe8iLXZ 43Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z1pwI3vYS5zF+thwL7KFBLXWBDqCuQgrG7iqQ6JY8Jc=; b=NghsJJtooxPUv8fzXy2LqQ8O1Pylhel4lCQpVnVIGBVJ6WE8WKoYPcqYEyvqkRdGNW rOwb9LQkRYSysLV5adfRlKoUYpI9qD8oIS7UKvdyarMEi0W8tbfZcB9Ip1HxRZHu7LAS i/Nrw8tY6Sk5AWQ0jrG/LZD4XzZlr12spqubVKF67cZaf46+keMF436FRmB7tJ6LboVc Fk0iGiJB0tyi6+jVjhTmgWGFpoVZ8HSQes2m348iXx+M33UjmgPDmTH2SpulQZ2eIrYF diBXC44rijr6BwQhMmRkpRepdM5kSYI10KViY3UmKllA1SbNC0pseOev6k+DtqqQZIJ2 VUlg== X-Gm-Message-State: AOAM530J0UahrHMdzyRANqYcMHYTxyJhr63DMsvPs/FD0pHmHuZu/PLj +R2pp/Rt74aYRamEH4ce9+Lvng== X-Google-Smtp-Source: ABdhPJwYGhuBcvF5oLnpe5pfVfpvTLwwL6cp1TM87aXKHo8HpQJbil47RqC9Grc/jKMsKRmqM5fHjw== X-Received: by 2002:adf:b1db:: with SMTP id r27mr5557681wra.125.1611078730922; Tue, 19 Jan 2021 09:52:10 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n6sm5516896wmi.23.2021.01.19.09.52.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 09:52:08 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 21A8A1FF87; Tue, 19 Jan 2021 17:52:08 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/6] tests/docker: Fix _get_so_libs() for docker-binfmt-image Date: Tue, 19 Jan 2021 17:52:02 +0000 Message-Id: <20210119175208.763-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210119175208.763-1-alex.bennee@linaro.org> References: <20210119175208.763-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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 = _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é Signed-off-by: Alex Bennée 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