From 7c1a2a4c55e1e16f33e398acefba22c61936fa00 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Mon, 24 Nov 2014 19:12:37 +0200 Subject: [PATCH] patchseries: strip numbering when guessing subject from filename Change-Id: I58c4f8871411dae15d0e0e4246f0eebe65e3967d Signed-off-by: Markus Lehtonen --- gbp/patch_series.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gbp/patch_series.py b/gbp/patch_series.py index 10fccfc..327997f 100644 --- a/gbp/patch_series.py +++ b/gbp/patch_series.py @@ -95,6 +95,12 @@ class Patch(object): >>> p = Patch('debian/patches/foo') >>> p._get_subject_from_filename() 'foo' + >>> Patch('0123-foo.patch')._get_subject_from_filename() + 'foo' + >>> Patch('0123.patch')._get_subject_from_filename() + '0123' + >>> Patch('0123-foo-0123.patch')._get_subject_from_filename() + 'foo-0123' @return: the patch's subject @rtype: C{str} @@ -107,7 +113,7 @@ class Patch(object): subject = base except ValueError: pass # No ext so keep subject as is - return subject + return subject.lstrip('0123456789-') or subject def _get_info_field(self, key, get_val=None): """ -- 2.7.4