Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-23 13:56:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

patman: Update defaults in subparsers

Browse source 
At present values from the settings file are only applied to the main
parser. With the new parser structure this means that some settings are
ignored.

Update the implementation to set defaults across the main parser and all
subparsers. Also fix up the comments, since ArgumentParser is being used
now.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-11-03 13:54:13 -07:00
parent 53336e6ca8
commit 3145b63513
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tools/patman/settings.py
View file

@ -7,6 +7,7 @@ try:
except: except:
import ConfigParser import ConfigParser
import argparse
import os import os
import re import re
@ -216,10 +217,10 @@ nxp = Zhikang Zhang <zhikang.zhang@nxp.com>
''' % (name, email), file=f) ''' % (name, email), file=f)
f.close(); f.close();
def _UpdateDefaults(parser, config): def _UpdateDefaults(main_parser, config):
"""Update the given OptionParser defaults based on config. """Update the given OptionParser defaults based on config.
We'll walk through all of the settings from the parser We'll walk through all of the settings from all parsers.
For each setting we'll look for a default in the option parser. For each setting we'll look for a default in the option parser.
If it's found we'll update the option parser default. If it's found we'll update the option parser default.
@ -228,13 +229,24 @@ def _UpdateDefaults(parser, config):
say. say.
Args: Args:
parser: An instance of an OptionParser whose defaults will be parser: An instance of an ArgumentParser whose defaults will be
updated. updated.
config: An instance of _ProjectConfigParser that we will query config: An instance of _ProjectConfigParser that we will query
for settings. for settings.
""" """
defaults = parser.parse_known_args()[0] # Find all the parsers and subparsers
defaults = vars(defaults) parsers = [main_parser]
parsers += [subparser for action in main_parser._actions
if isinstance(action, argparse._SubParsersAction)
for _, subparser in action.choices.items()]
# Collect the defaults from each parser
defaults = {}
for parser in parsers:
pdefs = parser.parse_known_args()[0]
defaults.update(vars(pdefs))
# Go through the settings and collect defaults
for name, val in config.items('settings'): for name, val in config.items('settings'):
if name in defaults: if name in defaults:
default_val = defaults[name] default_val = defaults[name]
@ -242,10 +254,14 @@ def _UpdateDefaults(parser, config):
val = config.getboolean('settings', name) val = config.getboolean('settings', name)
elif isinstance(default_val, int): elif isinstance(default_val, int):
val = config.getint('settings', name) val = config.getint('settings', name)
elif isinstance(default_val, str):
val = config.get('settings', name)
defaults[name] = val defaults[name] = val
else: else:
print("WARNING: Unknown setting %s" % name) print("WARNING: Unknown setting %s" % name)
parser.set_defaults(**defaults)
# Set all the defaults (this propagates through all subparsers)
main_parser.set_defaults(**defaults)
def _ReadAliasFile(fname): def _ReadAliasFile(fname):
"""Read in the U-Boot git alias file if it exists. """Read in the U-Boot git alias file if it exists.