spatch

commit f2fa12caf1ff7f51defedffed9ae7faf75e6f748
parent 90f9c58e7de29b29fbaf7e78989184ddaaf9a41d
Author: Louis Burda <quent.burda@gmail.com>
Date:   Tue, 20 Jul 2021 23:18:57 +0200

small tweaks

Diffstat:
M
patch.py
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/patch.py b/patch.py
@@ -4,8 +4,8 @@ import sys, os, re
 from os import path
 
 file_header = """\
---- ([^\n	]*)(	[^\n]*)?
-\+\+\+ ([^\n	]*)(	[^\n]*)?
+--- ([^\\n\\t]*)(\\t[^\n]*)?
+\+\+\+ ([^\\n\\t]*)(\\t[^\\n]*)?
 """
 file_header_pattern = re.compile(file_header)
 
@@ -69,8 +69,8 @@ def patch_file(src_filename, dst_filename, content):
                     src_nl = False
                 elif chunk_content[i-1][0] == '-':
                     dst_nl = False
-        src_lines += "\n" if src_nl else ""
-        dst_lines += "\n" if dst_nl else ""
+        src_lines += "\n" if src_nl and len(src_lines) > 0 else ""
+        dst_lines += "\n" if dst_nl and len(dst_lines) > 0 else ""
 
         try:
             replace_start = src_content.index(src_lines)