synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pmb.parse.kconfig.check_option: refactor 

Deduplicate the code for printing warnings and tweak it slightly:
* Shorten ".See <$url> for details." to ": $url".
* Include the component in the detailed output too.

Reviewed-by: Clayton Craft <clayton@craftyguy.net>
Link: https://lists.sr.ht/~postmarketos/pmbootstrap-devel/%3C20230312151325.1968-2-ollieparanoid@postmarketos.org%3E
This commit is contained in:
Oliver Smith 2023-03-12 16:13:08 +01:00
parent 2f9bdb7a66
commit dbe13fa812
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
1 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pmb/parse/kconfig.py
View File

@ -44,38 +44,28 @@ def is_in_array(config, option, string):
def check_option(component, details, config, config_path_pretty, option,
option_value):
link = (f"https://wiki.postmarketos.org/wiki/kconfig#CONFIG_{option}")
warning_no_details = (f"WARNING: {config_path_pretty} isn't"
f" configured properly for {component}, run"
f" 'pmbootstrap kconfig check' for details!")
def warn_ret_false(should_str):
if details:
logging.warning(f"WARNING: {config_path_pretty}: CONFIG_{option}"
f" should {should_str} ({component}):"
f" https://wiki.postmarketos.org/wiki/kconfig#CONFIG_{option}")
else:
logging.warning(f"WARNING: {config_path_pretty} isn't"
f" configured properly ({component}), run"
f" 'pmbootstrap kconfig check' for details!")
return False
if isinstance(option_value, list):
for string in option_value:
if not is_in_array(config, option, string):
if details:
logging.info(f"WARNING: {config_path_pretty}:"
f' CONFIG_{option} should contain "{string}".'
f" See <{link}> for details.")
else:
logging.warning(warning_no_details)
return False
return warn_ret_false(f'contain "{string}"')
elif isinstance(option_value, str):
if not is_set_str(config, option, option_value):
if details:
logging.info(f"WARNING: {config_path_pretty}: CONFIG_{option}"
f' should be set to "{option_value}".'
f" See <{link}> for details.")
else:
logging.warning(warning_no_details)
return False
return warn_ret_false(f'be set to "{option_value}"')
elif option_value in [True, False]:
if option_value != is_set(config, option):
if details:
should = "should" if option_value else "should *not*"
logging.info(f"WARNING: {config_path_pretty}: CONFIG_{option}"
f" {should} be set. See <{link}> for details.")
else:
logging.warning(warning_no_details)
return False
return warn_ret_false("be set" if option_value else "*not* be set")
else:
raise RuntimeError("kconfig check code can only handle booleans,"
f" strings and arrays. Given value {option_value}"