diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2017-08-09 13:54:48 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2017-08-09 13:56:24 -0700 |
| commit | 2d0cefbcbf9612538171c581485c290f140b57ff (patch) | |
| tree | d30ed0aa299cf6d12ebfbc7f58080f6a2f226f6a | |
| parent | GitSync: fix subprocess.CalledProcessError reference (bug 627416) (diff) | |
| download | portage-2d0cefbcbf9612538171c581485c290f140b57ff.tar.gz portage-2d0cefbcbf9612538171c581485c290f140b57ff.tar.bz2 portage-2d0cefbcbf9612538171c581485c290f140b57ff.zip | |
GitSync.retrieve_head: return str, not bytes (bug 625888)
Fixes: 0e1699ad6b3f ("emerge: Add head commit per repo to --info")
| -rw-r--r-- | pym/portage/sync/modules/git/git.py | 5 |
1 files 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 |