From bc2403dcdbeaef0abc52d0c24a9f3e849fd34ab8 Mon Sep 17 00:00:00 2001 From: Chris Laplante Date: Sun, 12 Jan 2025 09:53:54 -0500 Subject: devtool: un-globalize 'workspace' variable (From OE-Core rev: 3d32e507588fc292bf0f656b26817aee407f2d7c) Signed-off-by: Chris Laplante Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- scripts/devtool | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') 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): -- cgit v1.2.3-54-g00ecf