mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

devtool: un-globalize the 'basepath' variable

Browse Source 
(From OE-Core rev: 8a73a384e9cbd7ecf3b6f05bfc28574784725801)

Signed-off-by: Chris Laplante <chris.laplante@agilent.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chris Laplante
2025-01-12 09:53:53 -05:00
committed by Richard Purdie
parent e59da05be4
commit e6503a7f38
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/devtool
+9 -10
View File
@@ -13,10 +13,8 @@ import argparse
import glob import glob
import re import re
import configparser import configparser
import subprocess
import logging import logging
basepath = ''
workspace = {} workspace = {}
config = None config = None
context = None context = None
@@ -33,13 +31,15 @@ logger = scriptutils.logger_create('devtool')
plugins = [] plugins = []
class ConfigHandler(object): class ConfigHandler:
basepath = None
config_file = '' config_file = ''
config_obj = None config_obj = None
init_path = '' init_path = ''
workspace_path = '' workspace_path = ''
def __init__(self, filename): def __init__(self, basepath, filename):
self.basepath = basepath
self.config_file = filename self.config_file = filename
self.config_obj = configparser.ConfigParser() self.config_obj = configparser.ConfigParser()
@@ -59,14 +59,14 @@ class ConfigHandler(object):
if self.config_obj.has_option('General', 'init_path'): if self.config_obj.has_option('General', 'init_path'):
pth = self.get('General', 'init_path') pth = self.get('General', 'init_path')
self.init_path = os.path.join(basepath, pth) self.init_path = os.path.join(self.basepath, pth)
if not os.path.exists(self.init_path): if not os.path.exists(self.init_path):
logger.error('init_path %s specified in config file cannot be found' % pth) logger.error('init_path %s specified in config file cannot be found' % pth)
return False return False
else: else:
self.config_obj.add_section('General') self.config_obj.add_section('General')
self.workspace_path = self.get('General', 'workspace_path', os.path.join(basepath, 'workspace')) self.workspace_path = self.get('General', 'workspace_path', os.path.join(self.basepath, 'workspace'))
return True return True
@@ -86,7 +86,7 @@ class Context:
self.__dict__.update(kwargs) self.__dict__.update(kwargs)
def read_workspace(): def read_workspace(basepath):
global workspace global workspace
workspace = {} workspace = {}
if not os.path.exists(os.path.join(config.workspace_path, 'conf', 'layer.conf')): if not os.path.exists(os.path.join(config.workspace_path, 'conf', 'layer.conf')):
@@ -209,7 +209,6 @@ def _enable_workspace_layer(workspacedir, config, basepath):
def main(): def main():
global basepath
global config global config
global context global context
@@ -264,7 +263,7 @@ def main():
logger.debug('Using basepath %s' % basepath) logger.debug('Using basepath %s' % basepath)
config = ConfigHandler(os.path.join(basepath, 'conf', 'devtool.conf')) config = ConfigHandler(basepath, os.path.join(basepath, 'conf', 'devtool.conf'))
if not config.read(): if not config.read():
return -1 return -1
context.config = config context.config = config
@@ -332,7 +331,7 @@ def main():
try: try:
if not getattr(args, 'no_workspace', False): if not getattr(args, 'no_workspace', False):
read_workspace() read_workspace(basepath)
ret = args.func(args, config, basepath, workspace) ret = args.func(args, config, basepath, workspace)
except DevtoolError as err: except DevtoolError as err: