Fix description/diff delimiting in import

Only '---' should be a valid form of delimiting (or 'diff -') but not
more than three '-'.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index de735c42eb953ada1114fa5abd1c662d795d418f..43bd2f1e901661a1b439ebf558805663efa3025b 100644 (file)
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -90,7 +90,7 @@ def __parse_mail(filename = None):
 
     # the rest of the patch description
     for line in f:
 
     # the rest of the patch description
     for line in f:

-        if re.match('----*\s*$', line) or re.match('diff -', line):
+        if re.match('---\s*$', line) or re.match('diff -', line):

             break
         else:
             descr += line
             break
         else:
             descr += line


@@ -119,7 +119,7 @@ def __parse_patch(filename = None):
             auth = re.findall('^.*?:\s+(.*)$', line)[0]
             authname, authemail = name_email(auth)
 
             auth = re.findall('^.*?:\s+(.*)$', line)[0]
             authname, authemail = name_email(auth)
 

-        if re.match('----*\s*$', line) or re.match('diff -', line):
+        if re.match('---\s*$', line) or re.match('diff -', line):

             break
         else:
             descr += line
             break
         else:
             descr += line