diff options
| author | Simon Glass <sjg@chromium.org> | 2020-06-07 06:45:49 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-07-09 18:57:22 -0600 |
| commit | dd3dac2f2cd8bc008f11e0108d3fb64d0e4e8fd9 (patch) | |
| tree | ebed7b50c459f8bbf2030e935fa1e63522043994 | |
| parent | 156e655372f4221844d3483045dfdeffbb8bd0b1 (diff) | |
| download | u-boot-dd3dac2f2cd8bc008f11e0108d3fb64d0e4e8fd9.zip u-boot-dd3dac2f2cd8bc008f11e0108d3fb64d0e4e8fd9.tar.gz u-boot-dd3dac2f2cd8bc008f11e0108d3fb64d0e4e8fd9.tar.bz2 | |
patman: Avoid importing gitutil in settings
Pass this module in so that settings does not need to import it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Stefan Bosch <stefan_b@posteo.net>
| -rwxr-xr-x | tools/patman/main.py | 2 | ||||
| -rw-r--r-- | tools/patman/settings.py | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tools/patman/main.py b/tools/patman/main.py index 0974c84..0df2aa5 100755 --- a/tools/patman/main.py +++ b/tools/patman/main.py @@ -80,7 +80,7 @@ specified by tags you place in the commits. Use -n to do a dry run first.""" # Parse options twice: first to get the project and second to handle # defaults properly (which depends on project). (options, args) = parser.parse_args() -settings.Setup(parser, options.project, '') +settings.Setup(gitutil, parser, options.project, '') (options, args) = parser.parse_args() if __name__ != "__main__": diff --git a/tools/patman/settings.py b/tools/patman/settings.py index ca74fc6..635561a 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) |