fix run error: re.error: bad escape \S at position 7

Change-Id: I6f9e25806b43aa66a1c05cad0d54edbc656f733b
Signed-off-by: biao716.wang <biao716.wang@samsung.com>

diff --git a/gbp/deb/changelog.py b/gbp/deb/changelog.py
index 41aca947ecb8189cdd8ddcb67b816b4e88ab2fed..a670332e186ba8b2f607e53dd65d23e13523e656 100644 (file)
--- a/gbp/deb/changelog.py
+++ b/gbp/deb/changelog.py
@@ -96,7 +96,7 @@ class ChangeLog(object):
         (output, errors) = cmd.communicate(self._contents.encode('utf-8'))
         if cmd.returncode:
             raise ParseChangeLogError("Failed to parse changelog. "
-                                      "dpkg-parsechangelog said:\n%s" % errors.decode().strip()))
+                                      "dpkg-parsechangelog said:\n%s" % errors.decode().strip())
         # Parse the result of dpkg-parsechangelog (which looks like
         # email headers)
         cp = email.message_from_string(output)

diff --git a/gbp/rpm/__init__.py b/gbp/rpm/__init__.py
index 62f0c279d6b1bf5c7c26d5f473d9a296cac38a8f..0affa457ea361f7b9dea65b11339599f7ef03855 100644 (file)
--- a/gbp/rpm/__init__.py
+++ b/gbp/rpm/__init__.py
@@ -199,7 +199,7 @@ class SpecFile(object):
                 librpm.spec(filtered.name)
                 return librpm.spec(filtered.name)
             except ValueError as err:
-                rpmlog = get_librpm_log()
+                rpmlog = [log.decode() for log in get_librpm_log()]
                 gbp.log.debug("librpm log:\n        %s" %
                                 "\n        ".join(rpmlog))
                 raise GbpError("RPM error while parsing %s: %s (%s)" %

diff --git a/gbp/scripts/common/pq.py b/gbp/scripts/common/pq.py
index 95516c087cde8bbf8d4e2647ae5fbe56bc9052d6..05993d1de4123248d7566d4a7c60ee43fa8c1862 100644 (file)
--- a/gbp/scripts/common/pq.py
+++ b/gbp/scripts/common/pq.py
@@ -182,6 +182,7 @@ def patch_path_filter(file_status, exclude_regex=None):
         include_paths = []
         for file_list in list(file_status.values()):
             for fname in file_list:
+                fname = fname.decode()
                 if not re.match(exclude_regex, fname):
                     include_paths.append(fname)
     else:

diff --git a/gbp/scripts/rpm_ch.py b/gbp/scripts/rpm_ch.py
index b2a836aa02fdfe3e05518882c72c473d5ec65753..d134b76d03fe3a5e644832977a26398d2684aaf3 100755 (executable)
--- a/gbp/scripts/rpm_ch.py
+++ b/gbp/scripts/rpm_ch.py
@@ -186,7 +186,7 @@ def guess_commit(section, repo, options):
     header = section.header
 
     # Try to parse the fields from the header revision
-    rev_re = '^%s$' % re.sub(r'%\((\S+?)\)s', r'(?P<\1>\S+)',
+    rev_re = '^%s$' % re.sub(r'%\((\S+?)\)s', r'(?P<\1>\\S+)',
                              options.changelog_revision)
     match = re.match(rev_re, header['revision'], re.I)
     fields = match.groupdict() if match else {}