help = 'send a patch or series of patches by e-mail'
-usage = """%prog [options] [<patch>]
+usage = """%prog [options] [<patch> [<patch2...]]
Send a patch or a range of patches (defaulting to the applied patches)
by e-mail using the 'smtpserver' configuration option. The From
metavar = '[PATCH1][:[PATCH2]]',
help = 'e-mail patches between PATCH1 and PATCH2'),
make_option('--to',
- help = 'add TO to the To: list'),
+ help = 'add TO to the To: list',
+ action = 'append'),
make_option('--cc',
- help = 'add CC to the Cc: list'),
+ help = 'add CC to the Cc: list',
+ action = 'append'),
make_option('--bcc',
- help = 'add BCC to the Bcc: list'),
+ help = 'add BCC to the Bcc: list',
+ action = 'append'),
make_option('-v', '--version', metavar = 'VERSION',
help = 'add VERSION to the [PATCH ...] prefix'),
make_option('-t', '--template', metavar = 'FILE',
"""Return a two elements tuple: (from, [to])
"""
def __addr_list(string):
- return re.split('.*?([\w\.]+@[\w\.]+)', string)[1:-1:2]
+ m = re.search('[^@\s<,]+@[^>\s,]+', string);
+ if (m == None):
+ return []
+ return [ m.group() ] + __addr_list(string[m.end():])
from_addr_list = []
to_addr_list = []
elif re.match('(to|cc|bcc):\s+', line, re.I):
to_addr_list += __addr_list(line)
- if len(from_addr_list) != 1:
+ if len(from_addr_list) == 0:
raise CmdException, 'No "From" address'
if len(to_addr_list) == 0:
raise CmdException, 'No "To/Cc/Bcc" addresses'
s.quit()
+def __build_address_headers(options):
+ headers_end = ''
+ if options.to:
+ headers_end += 'To: '
+ for to in options.to:
+ headers_end += '%s,' % to
+ headers_end = headers_end[:-1] + '\n'
+ if options.cc:
+ headers_end += 'Cc: '
+ for cc in options.cc:
+ headers_end += '%s,' % cc
+ headers_end = headers_end[:-1] + '\n'
+ if options.bcc:
+ headers_end += 'Bcc: '
+ for bcc in options.bcc:
+ headers_end += '%s,' % bcc
+ headers_end = headers_end[:-1] + '\n'
+ return headers_end
+
def __build_first(tmpl, total_nr, msg_id, options):
"""Build the first message (series description) to be sent via SMTP
"""
if not maintainer:
maintainer = ''
- headers_end = ''
- if options.to:
- headers_end += 'To: %s\n' % options.to
- if options.cc:
- headers_end += 'Cc: %s\n' % options.cc
- if options.bcc:
- headers_end += 'Bcc: %s\n' % options.bcc
+ headers_end = __build_address_headers(options)
headers_end += 'Message-Id: %s\n' % msg_id
if options.version:
version_str = ' %s' % options.version
+ else:
+ version_str = ''
total_nr_str = str(total_nr)
patch_nr_str = '0'.zfill(len(total_nr_str))
if not maintainer:
maintainer = '%s <%s>' % (p.get_commname(), p.get_commemail())
- headers_end = ''
- if options.to:
- headers_end += 'To: %s\n' % options.to
- if options.cc:
- headers_end += 'Cc: %s\n' % options.cc
- if options.bcc:
- headers_end += 'Bcc: %s\n' % options.bcc
+ headers_end = __build_address_headers(options)
headers_end += 'Message-Id: %s\n' % msg_id
if ref_id:
headers_end += "In-Reply-To: %s\n" % ref_id
if options.version:
version_str = ' %s' % options.version
+ else:
+ version_str = ''
total_nr_str = str(total_nr)
patch_nr_str = str(patch_nr).zfill(len(total_nr_str))
"""Send the patches by e-mail using the patchmail.tmpl file as
a template
"""
- if len(args) > 1:
- parser.error('incorrect number of arguments')
-
if not config.has_option('stgit', 'smtpserver'):
raise CmdException, 'smtpserver not defined'
smtpserver = config.get('stgit', 'smtpserver')
applied = crt_series.get_applied()
- if len(args) == 1:
- if args[0] in applied:
- patches = [args[0]]
- else:
- raise CmdException, 'Patch "%s" not applied' % args[0]
+ if len(args) >= 1:
+ for patch in args:
+ if not patch in applied:
+ raise CmdException, 'Patch "%s" not applied' % patch
+ patches = args
elif options.all:
patches = applied
elif options.range: