| 1 |
commit: 2d0cefbcbf9612538171c581485c290f140b57ff |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 9 20:54:48 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 9 20:56:24 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2d0cefbc |
| 7 |
|
| 8 |
GitSync.retrieve_head: return str, not bytes (bug 625888) |
| 9 |
|
| 10 |
Fixes: 0e1699ad6b3f ("emerge: Add head commit per repo to --info") |
| 11 |
|
| 12 |
pym/portage/sync/modules/git/git.py | 5 +++-- |
| 13 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/portage/sync/modules/git/git.py b/pym/portage/sync/modules/git/git.py |
| 16 |
index 19c167485..8068149c7 100644 |
| 17 |
--- a/pym/portage/sync/modules/git/git.py |
| 18 |
+++ b/pym/portage/sync/modules/git/git.py |
| 19 |
@@ -137,8 +137,9 @@ class GitSync(NewBase): |
| 20 |
self._kwargs(kwargs) |
| 21 |
rev_cmd = [self.bin_command, "rev-list", "--max-count=1", "HEAD"] |
| 22 |
try: |
| 23 |
- ret = (os.EX_OK, subprocess.check_output(rev_cmd, |
| 24 |
- cwd=portage._unicode_encode(self.repo.location))) |
| 25 |
+ ret = (os.EX_OK, |
| 26 |
+ portage._unicode_decode(subprocess.check_output(rev_cmd, |
| 27 |
+ cwd=portage._unicode_encode(self.repo.location)))) |
| 28 |
except subprocess.CalledProcessError: |
| 29 |
ret = (1, False) |
| 30 |
return ret |
Archives