From patchwork Fri Dec 6 16:24:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "chris.laplante@agilent.com" X-Patchwork-Id: 53768 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62E05E77179 for ; Fri, 6 Dec 2024 16:25:22 +0000 (UTC) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.62]) by mx.groups.io with SMTP id smtpd.web11.41019.1733502320754342553 for ; Fri, 06 Dec 2024 08:25:21 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=inpckKe8; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: agilent.com, ip: 40.107.237.62, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qyV0EL4xPY4gjOaXI2GRcssfi8mkkhn1PsC8V7CWxuQ3u/SW9L2zFv+Bc46FXltO31/gaWgbNes7po+cO50oLgj2IVHhX45NvVdSnAFEiHF4/uJR3E/IVg+knwLTtm3tnn29HuNbh4YpF6qymhYwEY8Bgl+tPX6FF8kS18Biv7nL8VWT7gVuzIsnSMzdzjxEVGtCn1YwfBdfrk/FPlRytm/vSO1avSA6IQbE+sQjfbT9bE6xNtYDjg13uDvjz2sARcCrcx0a1e/ziCbhwq0v5rfx4TU6o9Lxq1VdaK3aMGTkuaBmAqri5WG6hElVrCdNMcreY6BO/v7yXGAIPkITuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ly/qGX/XTmAOC9EhaYUq+le04AKAHVYjc9c06uOENnA=; b=i6x65AE5NUIdwkUtYJJ/3EdioSMCmRH9pqaDI7m8iFV1uEkNSGUydhKRhYV0HwdS0vQOJGp8KRq+zofMHJlfPm3Nwdsgqt5iZwJVyNpL6b4Y4/BJUu2TJ7jp4S4Uk9OCtBO0vOOx2CeEAbK21RHcews5cDGNUO3u9hj2cD9aRdnAk//4gA3EIM1Mo4hnJhsQ83koyYdOOAn60szTLvRQjDgxLyFt+vZWQdCOvBGhvZLmkkw5PwWDOOaMu0/KzJOvn0YlzgNMaXN4ULh/aCdri7ERJt6VdTyF37IXyreK1lAJtgZs+LMvZW84xMyo8WgViBnf414dGNhsbl4cVtFhAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.37) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=agilent.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=agilent.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agilent.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ly/qGX/XTmAOC9EhaYUq+le04AKAHVYjc9c06uOENnA=; b=inpckKe8kIfqY4fclYwXTBGFdOQbrQUmhYqT8q0jEHfFs6LTu1TZobh912U4pnvODOMU8Kptm0dkuKePnKC2A5Sg5GMSEWCZehYWEDGcURkRBegF+g2NIC5Pc2qzC6Qn1eB8ekKj01/OtyysiEfAKV94ynj/VnPJcyjVMNzLUSNCwnlYQDuL91kV0iDAr86NZQWq1jhKbk4jgeKAgv/nXre2Z+rqwKPSDfnaNvXhs1keShHPfNHaYqchv0GvPYEz+iyvd1ebbj2n53dL25ktbEJ4W7Z17nlz4AOj/8UPhkmwmjo6Tnd+5npC5CzX+Gau7EtUWHNNvxELpiqlsES4Mw== Received: from DS7P220CA0048.NAMP220.PROD.OUTLOOK.COM (2603:10b6:8:224::6) by BL1PR12MB5945.namprd12.prod.outlook.com (2603:10b6:208:398::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.19; Fri, 6 Dec 2024 16:25:16 +0000 Received: from DS3PEPF0000C37A.namprd04.prod.outlook.com (2603:10b6:8:224:cafe::6d) by DS7P220CA0048.outlook.office365.com (2603:10b6:8:224::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.12 via Frontend Transport; Fri, 6 Dec 2024 16:25:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.37) smtp.mailfrom=agilent.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=agilent.com; Received-SPF: Pass (protection.outlook.com: domain of agilent.com designates 192.25.218.37 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.37; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.37) by DS3PEPF0000C37A.mail.protection.outlook.com (10.167.23.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Fri, 6 Dec 2024 16:25:16 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.4) by edgeappmail.agilent.com (192.25.218.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 6 Dec 2024 09:24:40 -0700 From: To: CC: Chris Laplante Subject: [PATCH 1/2] knotty: print an error if MACHINE is not set Date: Fri, 6 Dec 2024 11:24:40 -0500 Message-ID: <20241206162441.894274-1-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF0000C37A:EE_|BL1PR12MB5945:EE_ X-MS-Office365-Filtering-Correlation-Id: 5891568d-c207-4b67-e4c5-08dd161291ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: xLcwU/VMQUYbNhloAGvLFQ8/vg6WtUsjhQXJDzP9EEa7984JkXsnXG442HZIGS7mS3hYNa6Pb8p19NIEBMpPHcrfE2ucEFfLkJRBrWs7mYx+0ZPmFlzFOhQ1Vd2SwYpxgr0S8ADAoLxfe4zOSXiP1u8PgpI/ScOmvDIIIQKZxMxLEKz9Dh7+wGRxhHRujN+7UZ9uvlaLuOnywFo9nZEzEPsKiG4pbm8wgmg6WIxvvbhdIZJE0p5lZjSWU+Za38Qmjk/DcxhOnU40w7RU9y0cc3nP7d+9HcMyINmeOzMVaSfDNlYf6UOVQ0xKoet38G2+/EuA+u0pAdF+3NlQg8+Tlmv7q2k4GCX+FTGDj2ALTU73oqtKHKSSjdBZgBLjEPOROQo9YKagNtItmSF3HbyLjHJxMmV3Bs9tvTSosSO+LoBfPHs8Z4lwRMoB7cr7pEMY9Rhe5HCOODlo92MIye0Wna0BqXwDcUOLMJ6+HoqRnQmITmW3klNnf/aaNIkVJ0QyKX6w1w19U7XgB23Dbuq8mRyWXxMEA2/Bx4X7dgaEJ1yvv6KzOs5KVpJ7NEbbUQ/tqbQtK+xlMAFmRni1FDppRGudguwuA79WotaA8PCAAgkZrC9lXunxGpUasLcrTXiztAd5CmK1taody8JdCZYG3XsF4cs8zUN4T2u6+XTi3Gq7OVn93ZPBwSLsRphA2fiB11EgifF+zocq4CJyk5QcpMH0h8dZ/miuiYAHud3nmmjrWyByJbraVbZ6t0KouwVKJzk8jH9/+2IIM3Idig32rMLIrMgNCUEqJMlpdVEHhNhaeifRUX7VBz/SE97EtrVmPtsijNH9d8WBbjKVtyFW9DAk+9k5vrrJiA4cmAoqzFC9IvIAtC/sOzd6kwzIy/v8WugYDeLuE1NssysH0q5V9tiwCbfzO1H1TepsFQoz9LRoREyeEfShC0kVhDvTzxVrGdqP+x/WmkChbQwd1iX/k8nl3Rg6tsq9SEfcJaefwpzK8sMS5TpZQP1fFp4mObqpvHmxMYByM2CEFfknJV4ehgyWASNkaKRygbbLHDIc2otXXm+PKB+Xrjl1T3BiryZqAnDyHu3H+gpKWe/ecjDdPM2oqLubiLL228coI135PmAjqN2TPtE1Fza8abQIQpocxFQ7Xy2C2RlXJNvGeUNAbd+ap79rcpb278W0PMRxjuMBGR1N+PmGEUlcKNVaCAwbxLHTGxQ7kTYJcd2yH7/W29okb5T2PWcHPpGx/nKmVY9DST/K//QZgN7uAtJvXHiuzGMXGXwn8K+ED5+4CEswgMEHRQTVbDmm2pIV5xm88Ee4RJKHbppr/7BekocrfCG6G8tGkiUHgUJShraNDCVnyjT7u01deSzOJuN2ZuwL70KOtvqXwFCY3Q1yK11q6F6lEEI73jW9drevrMXAWQx7hRQ6VrZWrxF5kfm4oYD1PGPN4fhWY9hlLnADOZQ/DjR0 X-Forefront-Antispam-Report: CIP:192.25.218.37;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg1.windmz.agilent.com;CAT:NONE;SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2024 16:25:16.5551 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5891568d-c207-4b67-e4c5-08dd161291ba X-MS-Exchange-CrossTenant-Id: a9c0bc09-8b46-4206-9351-2ba12fb4a5c0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a9c0bc09-8b46-4206-9351-2ba12fb4a5c0;Ip=[192.25.218.37];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-DS3PEPF0000C37A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5945 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Dec 2024 16:25:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/16891 From: Chris Laplante When the user forgets to set MACHINE, bitbake just exits without printing anything. This is because BB_CONSOLELOG ends up with an unexpanded '${MACHINE}', which bb.utils.mkdirhier tries to report using bb.fatal. But bb.fatal utilizes the very logging infrastructure that this code was trying to setup. Signed-off-by: Chris Laplante --- lib/bb/ui/knotty.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -- 2.43.0 diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 3784c93ad8..881df9e5fb 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -555,8 +555,18 @@ def main(server, eventHandler, params, tf = TerminalFilter): } }) - bb.utils.mkdirhier(os.path.dirname(consolelogfile)) - loglink = os.path.join(os.path.dirname(consolelogfile), 'console-latest.log') + consolelogdirname = os.path.dirname(consolelogfile) + # `bb.utils.mkdirhier` has this check, but it reports failure using bb.fatal, which logs + # to the very logger we are trying to set up. + if '${' in str(consolelogdirname): + print( + "FATAL: Directory name {} contains unexpanded bitbake variable. This may cause build failures and WORKDIR pollution.".format( + consolelogdirname)) + if '${MACHINE}' in consolelogdirname: + print("HINT: It looks like you forgot to set MACHINE in local.conf.") + + bb.utils.mkdirhier(consolelogdirname) + loglink = os.path.join(consolelogdirname, 'console-latest.log') bb.utils.remove(loglink) try: os.symlink(os.path.basename(consolelogfile), loglink) From patchwork Fri Dec 6 16:24:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "chris.laplante@agilent.com" X-Patchwork-Id: 53769 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DE5CE77173 for ; Fri, 6 Dec 2024 16:25:42 +0000 (UTC) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.107.236.81]) by mx.groups.io with SMTP id smtpd.web10.41421.1733502332037637173 for ; Fri, 06 Dec 2024 08:25:32 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=s3wI12cy; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: agilent.com, ip: 40.107.236.81, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pNVEQyXl1GGa1vQKI5XRYHXEbjol43gPgj6yAZY6N5usrXEU4ys6PJbdk2pB9ao5NzbjHUPSyuuegh30+Qq4iIE+73OSkhTNX1NgoX+qvntKVrtaz+PW8DecY1q6xwCVV4ZlpHp+vhtDGUcaSgAahN4cSUd/Q29gj9mev1HZfGWq7olIdZd/HxnV3PECB8s2iSh0fPKLp/AiBLCDMKrq+xZ4XM6NKOxNHUrw1X5I+rpDq7IX2twhVw8Y3NNm1MdZqWhrQWFVXODSo5LurXPcupcD/HqU7eKvE50lyMT2pk04mjIB/HYTkqkkcTM4DaqRu/G7OJIRi054f0x+FAU1EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9ZYtVE0Fs91npLpC01RYFlVTYmZxTcajUc0XC0Z+mDw=; b=ZVRDubqaS5QmmEYw/FsQ59tIBVKYhhD4yXWnrC0Phmq0JCwBRkiE1IlBB/IsosUcqBnvovmpPgfxcy05i9Xdrh895NHn4RuiZnaO0r3UJ0PMJPBP1Ft3AsFwikPvLY3W2RvD6KaObEQZysU7xeGHF/TIqNLSgZHwRo9w/C1YszHE5+6rCd1PduELnDeNdQ7hocV8v11b423TWtgDT4Ri8wvqiBTrNcq43K2ffsIIPimrbxoHZXvE4GDhhIm6ppNvUI89TPxE2IzOSekRLLLsg3uySbXSuaBT3StAtdIVB1vbWlBaY7rCx6AHbKF8u8zUMsmmzPLyKcxUx+7UMLPWgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.37) smtp.rcpttodomain=lists.openembedded.org smtp.mailfrom=agilent.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=agilent.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agilent.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9ZYtVE0Fs91npLpC01RYFlVTYmZxTcajUc0XC0Z+mDw=; b=s3wI12cyNkQaTbEzae0Z1ZFNpEwYG6oAezYxT2QuWEZiMTJLcldWV5Yv3AefQvfugQo8U+ksOCw7Q2WGF6PiYFhrYfIQ/lmYfNN3w68rlu+9Q+w0+VkhDlqsIXcy7qRmMfvdVq0XtvL+pFQEt114rgPuG9bkcEXtCFmfLYDvwEQVQyl/Jpe/TmQV9WDjAhFrKGuAgU9MNwxlB4OUouioUPQxze9jQI7U52WU/EXdD1+MpLC5Y46357jA+Hjopi/1XRdcqr7DEEskdxmu8KeNjo+BrcTS7h/Y/i117vKP3B0XJQPhtR/PGO5kUbRHvQrjgoblb+bb0jaN1ojBLuSd0Q== Received: from DS7P220CA0050.NAMP220.PROD.OUTLOOK.COM (2603:10b6:8:224::20) by DS0PR12MB7704.namprd12.prod.outlook.com (2603:10b6:8:138::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.20; Fri, 6 Dec 2024 16:25:17 +0000 Received: from DS3PEPF0000C37A.namprd04.prod.outlook.com (2603:10b6:8:224:cafe::ad) by DS7P220CA0050.outlook.office365.com (2603:10b6:8:224::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.13 via Frontend Transport; Fri, 6 Dec 2024 16:25:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.37) smtp.mailfrom=agilent.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=agilent.com; Received-SPF: Pass (protection.outlook.com: domain of agilent.com designates 192.25.218.37 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.37; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.37) by DS3PEPF0000C37A.mail.protection.outlook.com (10.167.23.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Fri, 6 Dec 2024 16:25:17 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.4) by edgeappmail.agilent.com (192.25.218.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 6 Dec 2024 09:24:40 -0700 From: To: CC: Chris Laplante Subject: [PATCH 2/2] knotty: some small cleanups while I'm in here Date: Fri, 6 Dec 2024 11:24:41 -0500 Message-ID: <20241206162441.894274-2-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241206162441.894274-1-chris.laplante@agilent.com> References: <20241206162441.894274-1-chris.laplante@agilent.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF0000C37A:EE_|DS0PR12MB7704:EE_ X-MS-Office365-Filtering-Correlation-Id: 15162ea2-680e-44ee-69e2-08dd16129221 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: xh5UAZfCQfdfBafPYI22qGouW1VfcGWX07jgl1JUJF0rTQoGg5tU55LFnK7iB/QY2DD8nuytouEyPEvwWJlbzCLiaPhPupnnwFkJfXOOq+AXR1+6h8MG4K3OuDjoriFnMcskeYmx0TkRmy43VQqoZxR4AO9WxoEHDiRtL3ysSku2WtRvpr8XE1MxB06LlEv+qkpFVY9Pgwzkzh8Nfxc8HI3KwAjxQ+IDDE86urmJ+88raCkZQaqVcOCZSnk81Jp2CmEnlvcrWTETmECXouBCS+t10+XeEXtid+XqM+80U0VKyZ+LSMEUfuTiB1XwQSZcHMoEigLwRhRYv6DtBtKAg8dpxId8RmaK7eAQNDvJUn5Lz+cNJgRRm2fjvK4wDhju1KxMquuORSPH9sJNVLXwM2ZzIpIzjtUu3kDUM7dW20n52fuKLVLCLdvzxm/vgBxu7HtwBJre1XJJq2NVy18xbrS3XfAu9IXl2oy1jabJFVKmyXtXFQ8M2wq2evsfeSk8+pNKzqQW45sHK6HMFF/WCDOBfDMGEW3s44/C4yoX7hi4Hti6ztHNlHqGNsomMBMQqtI6FsBr1PQGBJQkGw1rNg1UvpLoJP3JIEHY0XRktrs83lSYgxviatK4YY223ovVSs4KVYtWe0mbeRHE78z4/m4ln/7z3rh9MQvyOD+O5BQD6qWjCaEOlXv4189CX82yd+SvPojiDDNzD7fn052heXh0vJDXJR30OApXvJA9VRiZ6miyhvxTkP0jQVUmUgnKj2iCWpAtEbiBqethRZsd99RNAwwVRHN9wqztLHOdZsLu6309+2DQhX+rPWATI0b6GfJQlxULNBoS30ihhC+wM6yu8Z24Ff2Mmqua5BiuHq7jR0xkYzHQhHWHJI+mwJEOLG6o3Z6xwGONfaZ6BYUIoEn417ne1d38HbhYRkxEAWZNUQwCq7RnV2stjVIOrIgwcbYaP3sjAihPjjIu4gSGaCFI8w83hap2P09bAkO/dKysbL4u5TmlZDLN8Nt20wVben3K/ox5y5s9RgeOUae8KXHdXKPi/4XMDRvYTdEuj1UYMU1UDNCbHJJx/0T6SB2DvSAp/QwKWWOeQBw1D6YQWx37VauehjiGJ75X96Y+vR5o5RftZqv8VGyXMv7Up4OdGFsL/PI0mC6RRJ/zqvxlyiSwT1oDEBq+AR3M6NChVoZpsOVJclWWBpe92FL9wHjzBxhYBUsd44E7kndlyXMnM4XiY4W+VHeZCWmIkOwBkslXNM0qFYNmKYFrZbjg1sftAFOJl4vg+cQpPPa4m3zLim4GgyMUXBXXCy2QGh5NqaA2ZFlQXUMjbPuWLA5uvc4lnxoEahxP8g3+2jau6Br2rtmgdktYQGCPAkRMKCtOzu+HvChbgbACwqNfaHvYi6yQ/++OpEERtrmG+DkgewEZS/kigikaNAzReTSHEbUoHgws6e7HfLrGL/VEETjOeBuf X-Forefront-Antispam-Report: CIP:192.25.218.37;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg1.windmz.agilent.com;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2024 16:25:17.2270 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 15162ea2-680e-44ee-69e2-08dd16129221 X-MS-Exchange-CrossTenant-Id: a9c0bc09-8b46-4206-9351-2ba12fb4a5c0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a9c0bc09-8b46-4206-9351-2ba12fb4a5c0;Ip=[192.25.218.37];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-DS3PEPF0000C37A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7704 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Dec 2024 16:25:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/16892 From: Chris Laplante + missing imports + indentation fix + missing call to super __init__ + redundant parenthesis Signed-off-by: Chris Laplante --- lib/bb/ui/knotty.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) -- 2.43.0 diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 881df9e5fb..2fff1b3669 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -24,6 +24,12 @@ import atexit from itertools import groupby from bb.ui import uihelper +import bb.build +import bb.command +import bb.cooker +import bb.event +import bb.runqueue +import bb.utils featureSet = [bb.cooker.CookerFeatures.SEND_SANITYEVENTS, bb.cooker.CookerFeatures.BASEDATASTORE_TRACKING] @@ -103,7 +109,7 @@ def new_progress(msg, maxval): return NonInteractiveProgress(msg, maxval) def pluralise(singular, plural, qty): - if(qty == 1): + if qty == 1: return singular % qty else: return plural % qty @@ -112,6 +118,7 @@ def pluralise(singular, plural, qty): class InteractConsoleLogFilter(logging.Filter): def __init__(self, tf): self.tf = tf + super().__init__() def filter(self, record): if record.levelno == bb.msg.BBLogFormatter.NOTE and (record.msg.startswith("Running") or record.msg.startswith("recipe ")): @@ -569,9 +576,9 @@ def main(server, eventHandler, params, tf = TerminalFilter): loglink = os.path.join(consolelogdirname, 'console-latest.log') bb.utils.remove(loglink) try: - os.symlink(os.path.basename(consolelogfile), loglink) + os.symlink(os.path.basename(consolelogfile), loglink) except OSError: - pass + pass # Add the logging domains specified by the user on the command line for (domainarg, iterator) in groupby(params.debug_domains):