[gentoo-commits] proj/portage:master commit in: pym/portage/sync/modules/git/

[Zac Medico]

commit:     2d0cefbcbf9612538171c581485c290f140b57ff
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  9 20:54:48 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 20:56:24 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=2d0cefbc

GitSync.retrieve_head: return str, not bytes (bug 625888)

Fixes: 0e1699ad6b3f ("emerge: Add head commit per repo to --info")

 pym/portage/sync/modules/git/git.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pym/portage/sync/modules/git/git.py 
b/pym/portage/sync/modules/git/git.py
index 19c167485..8068149c7 100644
--- a/pym/portage/sync/modules/git/git.py
+++ b/pym/portage/sync/modules/git/git.py
@@ -137,8 +137,9 @@ class GitSync(NewBase):
                        self._kwargs(kwargs)
                rev_cmd = [self.bin_command, "rev-list", "--max-count=1", 
"HEAD"]
                try:
-                       ret = (os.EX_OK, subprocess.check_output(rev_cmd,
-                               
cwd=portage._unicode_encode(self.repo.location)))
+                       ret = (os.EX_OK,
+                               
portage._unicode_decode(subprocess.check_output(rev_cmd,
+                               
cwd=portage._unicode_encode(self.repo.location))))
                except subprocess.CalledProcessError:
                        ret = (1, False)
                return ret