else:
return None
-def __parse_addresses(string):
+def __parse_addresses(addresses):
"""Return a two elements tuple: (from, [to])
"""
- def __addr_list(string):
- m = re.search('[^@\s<,]+@[^>\s,]+', string);
- if (m == None):
- return []
- return [ m.group() ] + __addr_list(string[m.end():])
+ def __addr_list(addrs):
+ m = re.search('[^@\s<,]+@[^>\s,]+', addrs);
+ if (m == None):
+ return []
+ return [ m.group() ] + __addr_list(addrs[m.end():])
from_addr_list = []
to_addr_list = []
- for line in string.split('\n'):
+ for line in addresses.split('\n'):
if re.match('from:\s+', line, re.I):
from_addr_list += __addr_list(line)
elif re.match('(to|cc|bcc):\s+', line, re.I):
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'
+ headers_end += 'To: '
+ for to in options.to:
+ headers_end += '%s, ' % to
+ headers_end = headers_end[:-2] + '\n'
if options.cc:
- headers_end += 'Cc: '
- for cc in options.cc:
- headers_end += '%s,' % cc
- headers_end = headers_end[:-1] + '\n'
+ headers_end += 'Cc: '
+ for cc in options.cc:
+ headers_end += '%s, ' % cc
+ headers_end = headers_end[:-2] + '\n'
if options.bcc:
- headers_end += 'Bcc: '
- for bcc in options.bcc:
- headers_end += '%s,' % bcc
- headers_end = headers_end[:-1] + '\n'
+ headers_end += 'Bcc: '
+ for bcc in options.bcc:
+ headers_end += '%s, ' % bcc
+ headers_end = headers_end[:-2] + '\n'
return headers_end
def __build_cover(tmpl, total_nr, msg_id, options):
smtppassword = config.get('stgit', 'smtppassword')
applied = crt_series.get_applied()
+ unapplied = crt_series.get_unapplied()
if len(args) >= 1:
for patch in args:
- if not patch in applied:
+ if patch in unapplied:
raise CmdException, 'Patch "%s" not applied' % patch
- patches = args
+ if not patch in applied:
+ raise CmdException, 'Patch "%s" does not exist' % patch
+ patches = args
elif options.all:
patches = applied
elif options.range:
if start in applied:
start_idx = applied.index(start)
else:
- raise CmdException, 'Patch "%s" not applied' % start
+ if start in unapplied:
+ raise CmdException, 'Patch "%s" not applied' % start
+ else:
+ raise CmdException, 'Patch "%s" does not exist' % start
if stop in applied:
stop_idx = applied.index(stop) + 1
else:
- raise CmdException, 'Patch "%s" not applied' % stop
+ if stop in unapplied:
+ raise CmdException, 'Patch "%s" not applied' % stop
+ else:
+ raise CmdException, 'Patch "%s" does not exist' % stop
if start_idx >= stop_idx:
raise CmdException, 'Incorrect patch range order'