| Message ID | 20220429145334.2497202-1-sean.anderson@seco.com |
|---|---|
| State | Accepted |
| Commit | 4780f7d8a6b2f479884d4e6068a73d1a69f82d4d |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | [v2] patman: Fix defaults not propagating to subparsers | expand |
On python 3.8.10 (and 3.10), subparsers are not updated with defaults. I
suspect this is related to [1]. Fix this by explicitly updating
subparsers with settings.
[1] https://github.com/python/cpython/issues/89398
Fixes: 3145b63513 ("patman: Update defaults in subparsers")
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Tested-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
---
Changes in v2:
- Fix spelling of "propagating" in commit message
- Update comment to more clearly indicate intent
tools/patman/settings.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
Applied to u-boot-dm, thanks!
diff --git a/tools/patman/settings.py b/tools/patman/settings.py index 7c2b5c196c..4c847fe88f 100644 --- a/tools/patman/settings.py +++ b/tools/patman/settings.py @@ -246,8 +246,10 @@ def _UpdateDefaults(main_parser, config): # Collect the defaults from each parser defaults = {} + parser_defaults = [] for parser in parsers: pdefs = parser.parse_known_args()[0] + parser_defaults.append(pdefs) defaults.update(vars(pdefs)) # Go through the settings and collect defaults @@ -264,8 +266,11 @@ def _UpdateDefaults(main_parser, config): else: print("WARNING: Unknown setting %s" % name) - # Set all the defaults (this propagates through all subparsers) + # Set all the defaults and manually propagate them to subparsers main_parser.set_defaults(**defaults) + for parser, pdefs in zip(parsers, parser_defaults): + parser.set_defaults(**{ k: v for k, v in defaults.items() + if k in pdefs }) def _ReadAliasFile(fname): """Read in the U-Boot git alias file if it exists.
On python 3.8.10 (and 3.10), subparsers are not updated with defaults. I suspect this is related to [1]. Fix this by explicitly updating subparsers with settings. [1] https://github.com/python/cpython/issues/89398 Fixes: 3145b63513 ("patman: Update defaults in subparsers") Signed-off-by: Sean Anderson <sean.anderson@seco.com> Reviewed-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> Tested-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> --- Changes in v2: - Fix spelling of "propagating" in commit message - Update comment to more clearly indicate intent tools/patman/settings.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)