From bcb6d890a9805ef09bcaeb3c39a099895c6dd40f Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Sat, 25 Mar 2006 21:38:35 +0000 Subject: [PATCH] Fix the patch name stripping in import The current implementation was only stripping if both the prefix and the extension were present. Signed-off-by: Catalin Marinas --- stgit/commands/imprt.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py index 373372d..fcbe9d3 100644 --- a/stgit/commands/imprt.py +++ b/stgit/commands/imprt.py @@ -77,7 +77,10 @@ def __end_descr(line): re.match('Index: ', line) def __strip_patch_name(name): - return re.sub('^[0-9]+-(.*)\.(diff|patch)$', '\g<1>', name) + stripped = re.sub('^[0-9]+-(.*)$', '\g<1>', name) + stripped = re.sub('^(.*)\.(diff|patch)$', '\g<1>', stripped) + + return stripped def __parse_description(descr): """Parse the patch description and return the new description and @@ -281,13 +284,14 @@ def __import_series(filename, options): patch = re.sub('#.*$', '', line).strip() if not patch: continue + patchfile = os.path.join(patchdir, patch) + if options.strip: patch = __strip_patch_name(patch) if options.ignore and patch in applied: print 'Ignoring already applied patch "%s"' % patch continue - patchfile = os.path.join(patchdir, patch) __import_patch(patch, patchfile, options) def func(parser, options, args): -- 2.11.0