[Python-modules-commits] [python-git] 01/02: import patch.

[Takaki Taniguchi]

This is an automated email from the git hooks/post-receive script.

takaki pushed a commit to branch master
in repository python-git.

commit 14fd51f5c156f399057083b312f682e551fe6cfd
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Thu Mar 9 11:34:57 2017 +0900

    import patch.
    
    (Closes: #857171)
    import of git can cause import failures of unrelated modules due to
    undefined variable
---
 debian/patches/exe_exception.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/exe_exception.patch b/debian/patches/exe_exception.patch
new file mode 100644
index 0000000..7017c1d
--- /dev/null
+++ b/debian/patches/exe_exception.patch
@@ -0,0 +1,32 @@
+From: Yaroslav Halchenko <debian at onerussian.com>
+Subject: Pass exc value to be re-raised 
+
+Origin: https://github.com/gitpython-developers/GitPython/pull/598
+        https://github.com/gitpython-developers/GitPython/pull/603
+Bug-Debian: http://bugs.debian.org/
+Bug-Ubuntu: https://launchpad.net/bugs/
+Applied-Upstream: https://github.com/gitpython-developers/GitPython/commit/9ce2a4b235d2ebc38c3e081c1036e39bde9be036
+Last-Update: 2017-03-08
+
+diff --git a/git/compat.py b/git/compat.py
+index a2403d6..b804585 100644
+--- a/git/compat.py
++++ b/git/compat.py
+@@ -177,7 +177,7 @@ def surrogateescape_handler(exc):
+             # exception anyway after this function is called, even though I think
+             # it's doing what it should. It seems that the strict encoder is called
+             # to encode the unicode string that this function returns ...
+-            decoded = replace_surrogate_encode(mystring)
++            decoded = replace_surrogate_encode(mystring, exc)
+         else:
+             raise exc
+     except NotASurrogateError:
+@@ -189,7 +189,7 @@ class NotASurrogateError(Exception):
+     pass
+ 
+ 
+-def replace_surrogate_encode(mystring):
++def replace_surrogate_encode(mystring, exc):
+     """
+     Returns a (unicode) string, not the more logical bytes, because the codecs
+     register_error functionality expects this.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d811cfb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+exe_exception.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-git.git