[X2Go-Commits] [maintenancescripts] 01/01: git/hooks/update-script._irkerhook.py_: do not try to convert to unicode if data already is unicode.

git-admin at x2go.org git-admin at x2go.org
Wed Feb 28 02:20:38 CET 2018


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

x2go pushed a commit to branch master
in repository maintenancescripts.

commit 2c151635d18b7901c53cbbe70e6520a9318385ad
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Feb 28 02:20:30 2018 +0100

    git/hooks/update-script._irkerhook.py_: do not try to convert to unicode if data already is unicode.
---
 git/hooks/update-script._irkerhook.py_ | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/git/hooks/update-script._irkerhook.py_ b/git/hooks/update-script._irkerhook.py_
index 576cadb..84525d4 100755
--- a/git/hooks/update-script._irkerhook.py_
+++ b/git/hooks/update-script._irkerhook.py_
@@ -109,9 +109,12 @@ class Commit:
         # self.url) are normal byte strings, correctly encoded.
         # For some reason, applying the dict to the template still fails.
         # It doesn't fail if logmsg et. al. are converted to unicode objects first.
-        self.logmsg = unicode(self.logmsg, 'utf-8')
-        self.author_name = unicode(self.author_name, 'utf-8')
-        self.mail = unicode(self.mail, 'utf-8')
+        if not isinstance(self.logmsg, unicode):
+            self.logmsg = unicode(self.logmsg, 'utf-8')
+        if not isinstance(self.author_name, unicode):
+            self.author_name = unicode(self.author_name, 'utf-8')
+        if not isinstance(self.mail, unicode):
+            self.mail = unicode(self.mail, 'utf-8')
         res = self.template % self.__dict__
         return unicode(res, 'UTF-8') if not isinstance(res, unicode) else res
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git


More information about the x2go-commits mailing list