From a886dba4ab31ecc1858c65d9503598bd7b7eace4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20L=C3=B3pez?= Date: Tue, 27 Mar 2018 18:30:49 -0600 Subject: [PATCH] [FIX] runbot: Fix decode error --- runbot/models/repo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runbot/models/repo.py b/runbot/models/repo.py index 7b45a7e0..f3981f31 100644 --- a/runbot/models/repo.py +++ b/runbot/models/repo.py @@ -78,7 +78,7 @@ class runbot_repo(models.Model): for repo in self: cmd = ['git', '--git-dir=%s' % repo.path] + cmd _logger.info("git command: %s", ' '.join(cmd)) - return subprocess.check_output(cmd) + return subprocess.check_output(cmd).decode('utf-8') def _git_export(self, treeish, dest): """Export a git repo to dest""" @@ -149,7 +149,7 @@ class runbot_repo(models.Model): fields = ['refname', 'objectname', 'committerdate:iso8601', 'authorname', 'authoremail', 'subject', 'committername', 'committeremail'] fmt = "%00".join(["%(" + field + ")" for field in fields]) git_refs = repo._git(['for-each-ref', '--format', fmt, '--sort=-committerdate', 'refs/heads', 'refs/pull']) - git_refs = git_refs.decode('utf-8').strip() + git_refs = git_refs.strip() refs = [[field for field in line.split('\x00')] for line in git_refs.split('\n')]