mirror of
https://xff.cz/git/u-boot/
synced 2025-09-02 01:02:19 +02:00
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>
This commit is contained in:
@@ -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)
|
||||
|
||||
|
Reference in New Issue
Block a user