From: Wayne Davison <wayne@opencoder.net>
Date: Fri, 29 May 2020 03:48:24 +0000 (-0700)
Subject: Fix regex issue due to python 3.8 bug.
X-Git-Tag: v3.2.0pre1~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=364d302bca6b9701ccf731feb1d5e91febdd9277;p=thirdparty%2Frsync.git

Fix regex issue due to python 3.8 bug.
---

diff --git a/packaging/branch-from-patch b/packaging/branch-from-patch
index 493f557d..c4982d03 100755
--- a/packaging/branch-from-patch
+++ b/packaging/branch-from-patch
@@ -63,7 +63,7 @@ def main():
                  or re.match(r'^diff --git ', line)
                  or re.match(r'^--- (old|a)/', line)):
                     break
-                lines.append(re.sub(r'\s*\Z', "\n", line))
+                lines.append(re.sub(r'\s*\Z', "\n", line, 1))
         info_txt = ''.join(lines).strip() + "\n"
         lines = None