1 |
commit: 176e2c74b368c73b593553773e749b3f25ddad72 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 25 20:52:16 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 25 20:52:16 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=176e2c74 |
7 |
|
8 |
MergeProcess: handle unicode in elog pipe |
9 |
|
10 |
--- |
11 |
pym/portage/dbapi/_MergeProcess.py | 4 ++-- |
12 |
pym/portage/dbapi/vartree.py | 2 +- |
13 |
2 files changed, 3 insertions(+), 3 deletions(-) |
14 |
|
15 |
diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_MergeProcess.py |
16 |
index 5caeef3..b5c45b3 100644 |
17 |
--- a/pym/portage/dbapi/_MergeProcess.py |
18 |
+++ b/pym/portage/dbapi/_MergeProcess.py |
19 |
@@ -7,7 +7,7 @@ import traceback |
20 |
import errno |
21 |
import fcntl |
22 |
import portage |
23 |
-from portage import os, StringIO |
24 |
+from portage import os, StringIO, _unicode_decode |
25 |
import portage.elog.messages |
26 |
from _emerge.PollConstants import PollConstants |
27 |
from _emerge.SpawnProcess import SpawnProcess |
28 |
@@ -32,7 +32,7 @@ class MergeProcess(SpawnProcess): |
29 |
if e.errno not in (errno.EAGAIN, errno.EINTR): |
30 |
raise |
31 |
if output: |
32 |
- lines = output.split('\n') |
33 |
+ lines = _unicode_decode(output).split('\n') |
34 |
if len(lines) == 1: |
35 |
self._buf += lines[0] |
36 |
else: |
37 |
|
38 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
39 |
index 0e60af8..d463c3a 100644 |
40 |
--- a/pym/portage/dbapi/vartree.py |
41 |
+++ b/pym/portage/dbapi/vartree.py |
42 |
@@ -2802,7 +2802,7 @@ class dblink(object): |
43 |
buffer.append(' '.join(fields)) |
44 |
buffer.append('\n') |
45 |
if buffer: |
46 |
- os.write(self._pipe, ''.join(buffer)) |
47 |
+ os.write(self._pipe, _unicode_encode(''.join(buffer))) |
48 |
|
49 |
def treewalk(self, srcroot, destroot, inforoot, myebuild, cleanup=0, |
50 |
mydbapi=None, prev_mtimes=None): |