equal
deleted
inserted
replaced
326 |
326 |
327 def join(self, *p): |
327 def join(self, *p): |
328 return os.path.join(self.path, *p) |
328 return os.path.join(self.path, *p) |
329 |
329 |
330 def find_series(self, patch): |
330 def find_series(self, patch): |
331 pre = re.compile("(\s*)([^#]+)") |
331 def matchpatch(l): |
332 index = 0 |
332 l = l.split('#', 1)[0] |
333 for l in self.full_series: |
333 return l.strip() == patch |
334 m = pre.match(l) |
334 for index, l in enumerate(self.full_series): |
335 if m: |
335 if matchpatch(l): |
336 s = m.group(2) |
336 return index |
337 s = s.rstrip() |
|
338 if s == patch: |
|
339 return index |
|
340 index += 1 |
|
341 return None |
337 return None |
342 |
338 |
343 guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') |
339 guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') |
344 |
340 |
345 def parse_series(self): |
341 def parse_series(self): |