From patchwork Sun Jan 12 14:53:54 2025 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: 55395 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 0BA9CE7719E for ; Sun, 12 Jan 2025 14:55:04 +0000 (UTC) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (NAM04-DM6-obe.outbound.protection.outlook.com [40.107.102.77]) by mx.groups.io with SMTP id smtpd.web11.37269.1736693703195545735 for ; Sun, 12 Jan 2025 06:55:03 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@agilent.com header.s=selector1 header.b=K6AfbwSA; 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.102.77, mailfrom: chris.laplante@agilent.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=h4SXMyzsPztXqa5DACd1KAKispp2vk4o2oxUuLsdIjo6fH7v7YlNBxeQHc0FVm6bJXgHPL37iwncaSw0BNOkhfl/YH3fLcEUbuNKG45RAaHFUnNLY/je0UTAxY1//492lApL4FQc5OpHNq4+CIPag5c4JCdO4+LllzlFpRVVjPCssA/JkyMzzbL6gD692u+aXyKVoEdwL0Bji3+y/gtRxb4XnVQ+bjUQ8LX+lcNuhFcGt2I2hWB+q16yjjv9L5zDYMIQvO+fp9gDdskKT6bhh0LubGPJql2OBlM94mG2qRC5rCGoE3A9j4Z+hY5LvexLpovHBMScPXHinWUfSdnj5Q== 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=sJryUdLbY+xrvsKtnjrM7MyYoUPQgBZfY4UiJ7bZKCA=; b=pNOaxWm5P3/gaftYwAZRiwlxVAwHAAAvq2jU8mWGdDTqqTR3ter+A0BEgA46wMYvYAlzOJaIMxOUACOza9fhdMjG6A+16jBal6DdJWCqyHkY7SeqTq5G0Miyxr/Zcifaa8FWkwxQQpqeopgYPLJFuPo8Tq8anMuvCVyZLijGfsKuGl4v3EbQEpGv79mwrjb9Zw+S2VryGWlKj954tWGHaWO6k5bl/iyJ2Tc5S1iq0qJY0MTCG8KJwW8vR5RT0N9nVjKmGedwIoC5fJanMH9JHl69bMT93oIEH1667HvvKe/xUA+RdLwrQx4EcW78nEtK3Yw3JK8GChK4ey4T6f/0gw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 192.25.218.34) 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=sJryUdLbY+xrvsKtnjrM7MyYoUPQgBZfY4UiJ7bZKCA=; b=K6AfbwSAcnM06u28o1h7UY+vbSQP2oeHJMhVIUbxXj1LiQ4P+jTrri81cZhXn9twBZ1yUEDhSXp48lelaEY4szGMCnhXyo80MX/O7lFEMDLf+2aKfyUu7qYurL+Cncsa3zUZ5YsAL+EwTyr+ey2gUxZy/9//arYxcZh2DwEe8F4RpIdRcQuulePTONuCe4hayCfPwYzH16WaAGbrsh2dMTlYigaFJQU+8qlYjTbnPnXj51vZcB0ajNF3KKThOcxV4MFrIGUg57o5gn7XOYD0qbIxnIXEY+IV8ePAAprCatNyY+Aa36kZGhtiHlK2nnid5eTrOenZNCNIF5b4G5mL1Q== Received: from BN0PR04CA0121.namprd04.prod.outlook.com (2603:10b6:408:ed::6) by CY8PR12MB7217.namprd12.prod.outlook.com (2603:10b6:930:5b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8335.10; Sun, 12 Jan 2025 14:55:00 +0000 Received: from BN1PEPF00006003.namprd05.prod.outlook.com (2603:10b6:408:ed:cafe::9d) by BN0PR04CA0121.outlook.office365.com (2603:10b6:408:ed::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8335.18 via Frontend Transport; Sun, 12 Jan 2025 14:55:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 192.25.218.34) 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.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.25.218.34; helo=edgeappmail.agilent.com; pr=C Received: from edgeappmail.agilent.com (192.25.218.34) by BN1PEPF00006003.mail.protection.outlook.com (10.167.243.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8356.11 via Frontend Transport; Sun, 12 Jan 2025 14:54:59 +0000 Received: from laplante-B650.lfs.agilent.com (192.25.126.5) by edgeappmail.agilent.com (192.25.218.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Sun, 12 Jan 2025 07:54:55 -0700 From: To: CC: Chris Laplante Subject: [PATCH 2/7] devtool: un-globalize 'workspace' variable Date: Sun, 12 Jan 2025 09:53:54 -0500 Message-ID: <20250112145359.607585-3-chris.laplante@agilent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250112145359.607585-1-chris.laplante@agilent.com> References: <20250112145359.607585-1-chris.laplante@agilent.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00006003:EE_|CY8PR12MB7217:EE_ X-MS-Office365-Filtering-Correlation-Id: d067b462-6d54-4865-3829-08dd33191662 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: hugGETdSx6J+pO0pWxrOhgOCExbGOHDYQkPB2sCokxJugjvq5ucnFa1Ump1Ds6hCuNvPg4DNdwQ3jldnwwfEFu3DyvFHCX07yospvcby4AWV1N9o6uVPU2ec4eFQY9mpzSTh038kjGJjqqEljcwT5AQ1JmzesaonsALFFafCgiM7smjzMtg69yexjKHrlpYfr0gop5dB6bJh7QhrQ287fKfL4HcS8CnYWnHtHtsp10XZ5AqFwTK7FzfW4DOk1o/IQagn+o29raAngDH7GjiZ5ld/ytdrKUWBjxKGPbCGBR3vE/+0aslY5hAoA7z+QnXjEcAjQWin/B7E+Jek6/nuZIBbfwHHqbOEhX3pO9h22d60gHP4YdhXDM3WXJVz2e2TBkO2LHgfdzaueZScAT3gH3zfwRDb4wtSp4aay7OUSDP4ImKKDj7txVFL23ejbm9kN7bzO/FSW5nbXMzcOaa0cMQMk4Dtr7voF1SJ0sKAR9HT2STi34zvdkkoNj916V5Rld+n4WTvORMBKpvBSXfojO0Ak2EndV3SvX3sMqmKeK12LLcx2iFeXNI+JukNRpAjbWeZANBvpWHM+iY7N84QjM531NNOBNqv2zs2Z44qBxXSuRcmfCiGqCLbhQc1WPE9uYeJBIHqx0hQbI/QwyW1XTuL7U1mxg3TF9T4tEz7ni5KPuegKI3BWgAxp9p2ju4L1E/tLvttpxSv46PxPvX/j+SFFwYeCwVfKaUIddBpWMWqQnHVhVmelLu93nT5GVrlbMZp8bq53JFlIs9jFK/E7RNXK1Vm7HMPoQD1h8vxOfw72M5klecwMkGX03rWw/1YAmaN7TMzVgS4U4g22JCLCWwqHN53M/8ABJtqntw+PSKH/GI6R6W3VnHWWT/j9/52fhsafynn9IM25+x0jHmOtRVWzdIJQd8A7EWm9G9wIHDZFzNplZkoqcQI3kZZnHCvaWeraXDtDTb2Edjnuc772Rn/p0cZM4C8ZzdvTOeXhcCPJl/D39M27GWOQj+dULYQhc6EHAtlpTgOMD5/4XJ8dQeIMrr/snkqlfC2geYL00xVFRIUPyxW1fU84wgN4NBRwSJ1jpeq6uN5eU96YWbt6u+yfzkrwe+THkBpg2Ibzm/vYhnebf6wxLVd9IHIqT7Sni0c7RuHNQkxFLsW4NLIE2M6fuOQjigUl1jUk60/QStJXsy4LjZdsZEmGK/5kAoPkf4ic/BS9U2gE41UZBa2yoxUH+f1BMDR20fabRG4Y26oVLcqwgmlMocwWBMd8WqbABAzxFHIvAy4IoJoqFcZQTgVxeP5tQ0ifqi5jmFFOUEI7kDcWW6n//QIPbF2lAGv7YjtmGd7I6cSrJi284Lmvg85HUA8QYOpO25Pt1cdHwdLcEuXxwTJx731ZA4x2iDjzGgTnhRG249UhIfIKAzRs3mKhG8gtqM9gKRnd8xl96Dy6m+WDkVsPLseQhhPoXUTUW0uZhWn7xQc584F4KbJjCOV4kkBcCALscOQOYzPOcs= X-Forefront-Antispam-Report: CIP:192.25.218.34;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edgeappmail.agilent.com;PTR:wpcosapexchedg3.windmz.agilent.com;CAT:NONE;SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: agilent.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2025 14:54:59.7963 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d067b462-6d54-4865-3829-08dd33191662 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.34];Helo=[edgeappmail.agilent.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-BN1PEPF00006003.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7217 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 ; Sun, 12 Jan 2025 14:55:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209690 From: Chris Laplante Signed-off-by: Chris Laplante --- scripts/devtool | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/devtool b/scripts/devtool index acc4e0e982..d7a5903c9f 100755 --- a/scripts/devtool +++ b/scripts/devtool @@ -15,7 +15,6 @@ import re import configparser import logging -workspace = {} config = None context = None @@ -87,7 +86,6 @@ class Context: def read_workspace(basepath): - global workspace workspace = {} if not os.path.exists(os.path.join(config.workspace_path, 'conf', 'layer.conf')): if context.fixed_setup: @@ -132,6 +130,8 @@ def read_workspace(basepath): logger.debug('Found recipe %s' % pnvalues) workspace[pn] = pnvalues + return workspace + def create_workspace(args, config, basepath, workspace): if args.layerpath: workspacedir = os.path.abspath(args.layerpath) @@ -330,9 +330,9 @@ def main(): args = parser.parse_args(unparsed_args, namespace=global_args) try: + workspace = {} if not getattr(args, 'no_workspace', False): - read_workspace(basepath) - + workspace = read_workspace(basepath) ret = args.func(args, config, basepath, workspace) except DevtoolError as err: if str(err):