Instead of propagating it from the module entry point (main script).
Signed-off-by: Maxim Cournoyer maxim.cournoyer@savoirfairelinux.com ---
(no changes since v1)
tools/patman/__main__.py | 3 +-- tools/patman/settings.py | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/tools/patman/__main__.py b/tools/patman/__main__.py index 11f19281fb..3f092367ec 100755 --- a/tools/patman/__main__.py +++ b/tools/patman/__main__.py @@ -22,7 +22,6 @@ if __name__ == "__main__": from patman import command from patman import control from patman import func_test -from patman import gitutil from patman import project from patman import settings from patman import terminal @@ -119,7 +118,7 @@ status.add_argument('-f', '--force', action='store_true', argv = sys.argv[1:] args, rest = parser.parse_known_args(argv) if hasattr(args, 'project'): - settings.Setup(gitutil, parser, args.project, '') + settings.Setup(parser, args.project, '') args, rest = parser.parse_known_args(argv)
# If we have a command, it is safe to parse all arguments diff --git a/tools/patman/settings.py b/tools/patman/settings.py index 7fb9d6d5a0..5efad5ed78 100644 --- a/tools/patman/settings.py +++ b/tools/patman/settings.py @@ -11,6 +11,8 @@ import argparse import os import re
+from patman import gitutil + """Default settings per-project.
These are used by _ProjectConfigParser. Settings names should match @@ -190,7 +192,7 @@ def ReadGitAliases(fname): fd.close()
-def CreatePatmanConfigFile(gitutil, config_fname): +def CreatePatmanConfigFile(config_fname): """Creates a config file under $(HOME)/.patman if it can't find one.
Args: @@ -331,7 +333,7 @@ def GetItems(config, section): return []
-def Setup(gitutil, parser, project_name, config_fname=''): +def Setup(parser, project_name, config_fname=''): """Set up the settings module by reading config files.
Args: @@ -348,7 +350,7 @@ def Setup(gitutil, parser, project_name, config_fname=''):
if not os.path.exists(config_fname): print("No config file found ~/.patman\nCreating one...\n") - CreatePatmanConfigFile(gitutil, config_fname) + CreatePatmanConfigFile(config_fname)
config.read(config_fname)