Package: release.debian.org User: release.debian....@packages.debian.org Usertags: unblock
Please, unblock python-fastimport/0.9.6-3 diffstat for python-fastimport-0.9.6 python-fastimport-0.9.6 changelog | 8 +++++ patches/Cope_with_bytestrings_in_utf8_bytes_string.patch | 24 +++++++++++++++ patches/series | 1 3 files changed, 33 insertions(+) diff -Nru python-fastimport-0.9.6/debian/changelog python-fastimport-0.9.6/debian/changelog --- python-fastimport-0.9.6/debian/changelog 2016-04-24 18:27:02.000000000 +0200 +++ python-fastimport-0.9.6/debian/changelog 2017-04-23 08:40:09.000000000 +0200 @@ -1,3 +1,11 @@ +python-fastimport (0.9.6-3) unstable; urgency=medium + + * Team upload. + * Add patch from upstream to fix a crash with UTF-8 encoded author names. + LP: #1647101 + + -- Mattia Rizzolo <mat...@debian.org> Sun, 23 Apr 2017 08:40:09 +0200 + python-fastimport (0.9.6-2) unstable; urgency=medium * Only mark as breaking older versions of bzr-fastimport << diff -Nru python-fastimport-0.9.6/debian/patches/Cope_with_bytestrings_in_utf8_bytes_string.patch python-fastimport-0.9.6/debian/patches/Cope_with_bytestrings_in_utf8_bytes_string.patch --- python-fastimport-0.9.6/debian/patches/Cope_with_bytestrings_in_utf8_bytes_string.patch 1970-01-01 01:00:00.000000000 +0100 +++ python-fastimport-0.9.6/debian/patches/Cope_with_bytestrings_in_utf8_bytes_string.patch 2017-04-23 08:40:00.000000000 +0200 @@ -0,0 +1,24 @@ +Description: Cope with bytestrings in utf8_bytes_string() helper. +Author: Jelmer Vernooij <jel...@jelmer.uk> +Acked-By: Unit 193 <unit...@ubuntu.com> +Acked-By: Mattia Rizzolo <mat...@debian.org> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1647101 +Last-Update: 2017-04-23 + +--- a/fastimport/helpers.py ++++ b/fastimport/helpers.py +@@ -99,9 +99,12 @@ + + + def utf8_bytes_string(s): +- """Convert a string to a bytes string encoded in utf8""" ++ """Convert a string to a bytes string (if necessary, encode in utf8)""" + if sys.version_info[0] == 2: +- return s.encode('utf8') ++ if isinstance(s, str): ++ return s ++ else: ++ return s.encode('utf8') + else: + if isinstance(s, str): + return bytes(s, encoding='utf8') diff -Nru python-fastimport-0.9.6/debian/patches/series python-fastimport-0.9.6/debian/patches/series --- python-fastimport-0.9.6/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ python-fastimport-0.9.6/debian/patches/series 2017-04-23 08:36:56.000000000 +0200 @@ -0,0 +1 @@ +Cope_with_bytestrings_in_utf8_bytes_string.patch -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. more about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
signature.asc
Description: PGP signature