From: Yann Dirson Date: Tue, 12 Jun 2007 21:57:07 +0000 (+0100) Subject: Have mail take the default for --prefix from stgit.mail.prefix. X-Git-Tag: v0.13~42 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/a7e0d4ee29d73438463fd9855a5e23dbae8cbfa0 Have mail take the default for --prefix from stgit.mail.prefix. It is more convenient to set the prefix once and for all in the config file than each time on command line. --- diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py index cec1828..899cb1a 100644 --- a/stgit/commands/mail.py +++ b/stgit/commands/mail.py @@ -296,7 +296,11 @@ def __build_cover(tmpl, total_nr, msg_id, options): if options.prefix: prefix_str = options.prefix + ' ' else: - prefix_str = '' + confprefix = config.get('stgit.mail.prefix') + if confprefix: + prefix_str = confprefix + ' ' + else: + prefix_str = '' total_nr_str = str(total_nr) patch_nr_str = '0'.zfill(len(total_nr_str)) @@ -374,7 +378,11 @@ def __build_message(tmpl, patch, patch_nr, total_nr, msg_id, ref_id, options): if options.prefix: prefix_str = options.prefix + ' ' else: - prefix_str = '' + confprefix = config.get('stgit.mail.prefix') + if confprefix: + prefix_str = confprefix + ' ' + else: + prefix_str = '' if options.diff_opts: diff_flags = options.diff_opts.split()