CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: bitbake-setup: improve robustness of loading/writing settings

Browse Source 
Particularly:

- ensure global settings command line argument is always expanded to
full path
- ensure any errors that happen when loading settings are reported
at that point, otherwise we get an empty dictionary and cryptic
key errors later

(Bitbake rev: 578afa2f05dfa6727952365918df703875070f64)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2025-09-29 14:56:16 +02:00 committed by Richard Purdie
parent 1a55c45617
commit 32a3828d59
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitbake/bin/bitbake-setup
View File

@ -635,11 +635,11 @@ def load_settings(top_dir, non_interactive):
settings_path = default_settings_path(top_dir)
settings = configparser.ConfigParser()
print('Loading settings from\n {}\n'.format(settings_path))
settings.read([settings_path])
settings.read_file(open(settings_path))
return settings
def global_settings_path(args):
return args.global_settings if args.global_settings else os.path.join(os.path.expanduser('~'), '.config', 'bitbake-setup', 'config')
return os.path.abspath(args.global_settings) if args.global_settings else os.path.join(os.path.expanduser('~'), '.config', 'bitbake-setup', 'config')
def write_global_settings(settings_path, force_replace, non_interactive=True):
if not os.path.exists(settings_path) or force_replace:
@ -673,7 +673,7 @@ def load_global_settings(settings_path, non_interactive):
settings = configparser.ConfigParser()
print('Loading global settings from\n {}\n'.format(settings_path))
settings.read([settings_path])
settings.read_file(open(settings_path))
return settings
def change_settings(top_dir, new_settings):