[Python-modules-commits] [gerritlib] 02/02: merge patched into master

[Filip Pytloun]

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

fpytloun-guest pushed a commit to branch master
in repository gerritlib.

commit 4cbe3aed69cb6acbbbde32adab10c021aba8cd01
Merge: 566f209 83cb9c5
Author: Filip Pytloun <filip at pytloun.cz>
Date:   Wed Dec 13 15:48:20 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...-compatibility-by-decoding-bytes-to-strin.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 gerritlib/gerrit.py                                |  4 +++
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 131b585,0000000..9cb644e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- a5309c26f2878d9d9c0a6c001c14d71750b2c4a6
- a5309c26f2878d9d9c0a6c001c14d71750b2c4a6
++83cb9c5e5a85737481128a0b04a5cc15fa0c2e9b
++83cb9c5e5a85737481128a0b04a5cc15fa0c2e9b
 +a5309c26f2878d9d9c0a6c001c14d71750b2c4a6
 +a5309c26f2878d9d9c0a6c001c14d71750b2c4a6
 +gerritlib_0.8.0.orig.tar.gz
 +e67135cbad736fa1bd70838497c44b4b59a38349
 +15250
diff --cc debian/patches/0001-Fix-python3-compatibility-by-decoding-bytes-to-strin.patch
index 0000000,0000000..8f63960
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-python3-compatibility-by-decoding-bytes-to-strin.patch
@@@ -1,0 -1,0 +1,30 @@@
++From 83cb9c5e5a85737481128a0b04a5cc15fa0c2e9b Mon Sep 17 00:00:00 2001
++From: Filip Pytloun <filip at pytloun.cz>
++Date: Wed, 13 Dec 2017 15:48:15 +0100
++Subject: Fix python3 compatibility by decoding bytes to string
++
++---
++ gerritlib/gerrit.py | 4 ++++
++ 1 file changed, 4 insertions(+)
++
++diff --git a/gerritlib/gerrit.py b/gerritlib/gerrit.py
++index 5730aac..cf3cedf 100644
++--- a/gerritlib/gerrit.py
+++++ b/gerritlib/gerrit.py
++@@ -408,12 +408,16 @@ class Gerrit(object):
++         stdin, stdout, stderr = client.exec_command(command)
++ 
++         out = stdout.read()
+++        if type(out) == bytes:
+++            out = out.decode()
++         self.log.debug("SSH received stdout:\n%s" % out)
++ 
++         ret = stdout.channel.recv_exit_status()
++         self.log.debug("SSH exit status: %s" % ret)
++ 
++         err = stderr.read()
+++        if type(err) == bytes:
+++            err = err.decode()
++         self.log.debug("SSH received stderr:\n%s" % err)
++         if ret:
++             raise Exception("Gerrit error executing %s" % command)
diff --cc debian/patches/series
index 0000000,0000000..dd85a72
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-python3-compatibility-by-decoding-bytes-to-strin.patch

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