From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Oct 2018 12:54:47 +0000 (+0100)
Subject: Escape: Add missing doublings of \ in for-replacement strings
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d9efb7ca78a145226cc186746670e3bfb9a1e4ff;p=git-buildpackage.git

Escape: Add missing doublings of \ in for-replacement strings

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/gbp/deb/git.py b/gbp/deb/git.py
index ebeda76..20c3005 100644
--- a/gbp/deb/git.py
+++ b/gbp/deb/git.py
@@ -184,7 +184,7 @@ class DebianGitRepository(PkgGitRepository):
         r = re.search(cls.version_mangle_re, format)
         if r:
             f = re.sub(cls.version_mangle_re, "%(version)s", format)
-            v = version.replace(r.group('M'), r.group('R').replace('\%', '%'))
+            v = version.replace(r.group('M'), r.group('R').replace('\\%', '%'))
             return f, v
         else:
             return format, version
@@ -207,7 +207,7 @@ class DebianGitRepository(PkgGitRepository):
         """
         r = re.search(cls.version_mangle_re, format)
         if r:
-            v = tag.replace(r.group('R').replace('\%', '%'), r.group('M'))
+            v = tag.replace(r.group('R').replace('\\%', '%'), r.group('M'))
             return v
         else:
             return tag