Fix the patch name stripping in import

[stgit] / stgit / commands / imprt.py

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index 373372d1fcf2d99446e6e4d604560ff86c588d94..fcbe9d3e338a5028db4828c91fc455882ada920e 100644 (file)
--- 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):
             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
 
 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
         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
 
         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):
         __import_patch(patch, patchfile, options)
 
 def func(parser, options, args):