diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-10 16:22:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-10 16:22:57 -0400 |
| commit | 4a9146c29573dbfa661918280d9522a01f6ca919 (patch) | |
| tree | b1b135237dcfee94a27e8df7ce2208230c28b894 /tools/patman/settings.py | |
| parent | f30924739975b4f60c0862b539790fdcdb7da20c (diff) | |
| parent | 6c3fc50ee59366df62e8345ea9fd86c3ace0c3f1 (diff) | |
Merge tag 'dm-pull-10jul20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
of-platdata: better phandle and compatible-string support
patman support for Python3 on Ubuntu 14.04
new checkpatch check to avoid #ifdefs
Diffstat (limited to 'tools/patman/settings.py')
| -rw-r--r-- | tools/patman/settings.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/patman/settings.py b/tools/patman/settings.py index ca74fc611ff..635561ac056 100644 --- a/tools/patman/settings.py +++ b/tools/patman/settings.py @@ -11,7 +11,6 @@ import os import re from patman import command -from patman import gitutil from patman import tools """Default settings per-project. @@ -185,7 +184,7 @@ def ReadGitAliases(fname): fd.close() -def CreatePatmanConfigFile(config_fname): +def CreatePatmanConfigFile(gitutil, config_fname): """Creates a config file under $(HOME)/.patman if it can't find one. Args: @@ -301,7 +300,7 @@ def GetItems(config, section): except: raise -def Setup(parser, project_name, config_fname=''): +def Setup(gitutil, parser, project_name, config_fname=''): """Set up the settings module by reading config files. Args: @@ -318,7 +317,7 @@ def Setup(parser, project_name, config_fname=''): if not os.path.exists(config_fname): print("No config file found ~/.patman\nCreating one...\n") - CreatePatmanConfigFile(config_fname) + CreatePatmanConfigFile(gitutil, config_fname) config.read(config_fname) |