patman: Pass the alias dict into gitutil.email_patches()
Rather than accessing the settings module in this function, require the
alias dict to be passed in.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py
index eee20b9..b96bf7b 100644
--- a/tools/patman/func_test.py
+++ b/tools/patman/func_test.py
@@ -230,13 +230,14 @@
dry_run = True
in_reply_to = mel
count = 2
- settings.alias = {
+ alias = {
'fdt': ['simon'],
'u-boot': ['u-boot@lists.denx.de'],
'simon': [self.leb],
'fred': [self.fred],
'joe': [self.joe],
}
+ settings.alias = alias
text = self._get_text('test01.txt')
series = patchstream.get_metadata_for_test(text)
@@ -255,7 +256,7 @@
None, get_maintainer_script)
cmd = gitutil.email_patches(
series, cover_fname, args, dry_run, not ignore_bad_tags,
- cc_file, in_reply_to=in_reply_to, thread=None)
+ cc_file, alias, in_reply_to=in_reply_to, thread=None)
series.ShowActions(args, cmd, process_tags)
cc_lines = open(cc_file, encoding='utf-8').read().splitlines()
os.remove(cc_file)
diff --git a/tools/patman/send.py b/tools/patman/send.py
index 66f3c4e..9481a95 100644
--- a/tools/patman/send.py
+++ b/tools/patman/send.py
@@ -10,6 +10,7 @@
from patman import checkpatch
from patman import patchstream
+from patman import settings
from u_boot_pylib import gitutil
from u_boot_pylib import terminal
@@ -93,7 +94,7 @@
if its_a_go:
cmd = gitutil.email_patches(
series, cover_fname, patch_files, dry_run, not ignore_bad_tags,
- cc_file, in_reply_to=in_reply_to, thread=thread,
+ cc_file, settings.alias, in_reply_to=in_reply_to, thread=thread,
smtp_server=smtp_server)
else:
print(col.build(col.RED, "Not sending emails due to errors/warnings"))