[amp] 01/01: Fixing `TypeError: Can't convert 'bytes' object to str implicitly`.

[Muammar El Khatib]

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

muammar pushed a commit to branch master
in repository amp.

commit 1fe3795445c4de8cbb0eda90dade2a8aa06de57e
Author: Muammar El Khatib <muammarelkhatib at gmail.com>
Date:   Wed Sep 20 14:51:14 2017 -0400

    Fixing `TypeError: Can't convert 'bytes' object to str implicitly`.
---
 debian/changelog             |  7 +++++++
 debian/patches/02_init.patch | 17 +++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 33f9a6c..9d99cfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+amp (0.6-2) unstable; urgency=medium
+
+  * `TypeError: Can't convert 'bytes' object to str implicitly` error is
+    caught and fixed.
+
+ -- Muammar El Khatib <muammar at debian.org>  Wed, 20 Sep 2017 14:50:52 -0400
+
 amp (0.6-1) unstable; urgency=medium
 
   * Initial release (Closes: #790803)
diff --git a/debian/patches/02_init.patch b/debian/patches/02_init.patch
new file mode 100644
index 0000000..e13927b
--- /dev/null
+++ b/debian/patches/02_init.patch
@@ -0,0 +1,17 @@
+Description: This patch catches the `TypeError: Can't convert 'bytes' object to
+str implicitly`
+Author: Muammar El Khatib <muammar at debian.org>
+Last-Update: 2017-09-20
+Index: amp/amp/__init__.py
+===================================================================
+--- amp.orig/amp/__init__.py
++++ amp/amp/__init__.py
+@@ -463,7 +463,7 @@ def get_git_commit(ampdirectory):
+                                               '--pretty=%H\t%ci'],
+                                              stderr=devnull)
+     except:
+-        output = 'unknown hash\tunknown date'
++        output = b'unknown hash\tunknown date'
+     output = output.strip()
+     commithash, commitdate = output.split(b'\t')
+     os.chdir(pwd)
diff --git a/debian/patches/series b/debian/patches/series
index c3de10c..4828731 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_Makefile.patch
+02_init.patch

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