[X2Go-Commits] [maintenancescripts] 01/01: git/hooks/update-script._irkerhook.py_: force UTF-8 while decoding JSON.

git-admin at x2go.org git-admin at x2go.org
Mon Feb 8 18:35:34 CET 2016


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

x2go pushed a commit to branch master
in repository maintenancescripts.

commit 91f5e38a5a465425fcaaa62dca5b038839cfe53e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 8 18:35:25 2016 +0100

    git/hooks/update-script._irkerhook.py_: force UTF-8 while decoding JSON.
    
    Maybe this helps with UTF-8 in commit messages.
---
 git/hooks/update-script._irkerhook.py_ |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/hooks/update-script._irkerhook.py_ b/git/hooks/update-script._irkerhook.py_
index 917e3a1..3c47924 100755
--- a/git/hooks/update-script._irkerhook.py_
+++ b/git/hooks/update-script._irkerhook.py_
@@ -451,7 +451,7 @@ def ship(extractor, commit, debug):
                          shellquote(json.dumps(metadata.__dict__)))
         data = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read()
         try:
-            metadata.__dict__.update(json.loads(data))
+            metadata.__dict__.update(json.loads(data), encoding='utf-8')
         except ValueError:
             sys.stderr.write("irkerhook.py: could not decode JSON: %s\n" % data)
             raise SystemExit(1)

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


More information about the x2go-commits mailing list