When calculating the string to be used in the From: field, don't require
it to come from the configuration file. Instead, reuse already known
authname and authemail values as the default. They can be taken from
the GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL environment variables.
Signed-off-by: Pavel Roskin <proski@xxxxxxx>
---
stgit/commands/mail.py | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py
index 176d7a2..70b091f 100644
--- a/stgit/commands/mail.py
+++ b/stgit/commands/mail.py
@@ -122,18 +122,13 @@ options = [make_option('-a', '--all',
action = 'store_true')]
-def __get_sender():
- """Return the 'authname <authemail>' string as read from the
- configuration file
+def __get_sender(authname, authemail):
+ """Return the string to be used in the From: field
"""
if config.has_option('stgit', 'sender'):
return config.get('stgit', 'sender')
- elif config.has_option('stgit', 'authname') \
- and config.has_option('stgit', 'authemail'):
- return '%s <%s>' % (config.get('stgit', 'authname'),
- config.get('stgit', 'authemail'))
else:
- raise CmdException, 'unknown sender details'
+ return '%s <%s>' % (authname, authemail)
def __parse_addresses(addresses):
"""Return a two elements tuple: (from, [to])
@@ -298,7 +293,7 @@ def __edit_message(msg):
def __build_cover(tmpl, total_nr, msg_id, options):
"""Build the cover message (series description) to be sent via SMTP
"""
- sender = __get_sender()
+ sender = __get_sender(authname, authemail)
if options.version:
version_str = ' %s' % options.version
@@ -372,7 +367,7 @@ def __build_message(tmpl, patch, patch_nr, total_nr, msg_id, ref_id, options):
commname = p.get_commname();
commemail = p.get_commemail();
- sender = __get_sender()
+ sender = __get_sender(authname, authemail)
fromauth = '%s <%s>' % (authname, authemail)
if fromauth != sender:
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html