models.py: Improve Series naming when no cover letter is provided

PATCH Superseded Jose Lamego 1 participant 1 message Apr 7, 2017

Share & tools

Jose Lamego

author

2017-04-07 15:04 UTC #0 lore raw

PATCH 1/1 models.py: Improve Series naming when no cover letter is provided

The number/order prefix from a patch Subject line is inapropriately included when naming a Series where a cover letter is not provided and an additional prefix is present at the Subject.

This change improves the substitution regex to omit the number/order prefix but include any other prefix that may be present.

[YOCTO #11305]

Signed-off-by Jose Lamego <[email protected]>

---
 patchwork/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

patchwork/models.py +2 -2

index ddc3254..8b72f4a 100644
@@ -1046,8 +1046,8 @@ def _on_revision_complete(sender, revision, **kwargs):
     # so we can update the name for series without a cover letter
     if series.name == SERIES_DEFAULT_NAME:
         name = series.latest_revision().ordered_patches()[0].name
-        n = re.compile(r'(\[\d+\/\d+\]\s?)')
-        name = n.sub('', name)
+        n = re.compile(r'(\[\s*\w*\s*v\d+)(\W*\d+\/\d+)(\s*\]\s?.)*')
+        name = n.sub(r'\g<1>\g<3>', name)
         c = len(series.latest_revision().ordered_patches())
         # For one-patch series (1/1) without cover letter
         if c == 1:

Signature · 1 line

2.7.4