From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q3E0d-0002lV-0R for garchives@archives.gentoo.org; Fri, 25 Mar 2011 20:53:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B5441C07C; Fri, 25 Mar 2011 20:53:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0E6DE1C07C for ; Fri, 25 Mar 2011 20:53:16 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 863EF1B4109 for ; Fri, 25 Mar 2011 20:53:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D864280065 for ; Fri, 25 Mar 2011 20:53:15 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <176e2c74b368c73b593553773e749b3f25ddad72.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/_MergeProcess.py pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 176e2c74b368c73b593553773e749b3f25ddad72 Date: Fri, 25 Mar 2011 20:53:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 87204197c2e1b1e1aab85ec7ed780d5b commit: 176e2c74b368c73b593553773e749b3f25ddad72 Author: Zac Medico gentoo org> AuthorDate: Fri Mar 25 20:52:16 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Mar 25 20:52:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D176e2c74 MergeProcess: handle unicode in elog pipe --- pym/portage/dbapi/_MergeProcess.py | 4 ++-- pym/portage/dbapi/vartree.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_Merg= eProcess.py index 5caeef3..b5c45b3 100644 --- a/pym/portage/dbapi/_MergeProcess.py +++ b/pym/portage/dbapi/_MergeProcess.py @@ -7,7 +7,7 @@ import traceback import errno import fcntl import portage -from portage import os, StringIO +from portage import os, StringIO, _unicode_decode import portage.elog.messages from _emerge.PollConstants import PollConstants from _emerge.SpawnProcess import SpawnProcess @@ -32,7 +32,7 @@ class MergeProcess(SpawnProcess): if e.errno not in (errno.EAGAIN, errno.EINTR): raise if output: - lines =3D output.split('\n') + lines =3D _unicode_decode(output).split('\n') if len(lines) =3D=3D 1: self._buf +=3D lines[0] else: diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 0e60af8..d463c3a 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2802,7 +2802,7 @@ class dblink(object): buffer.append(' '.join(fields)) buffer.append('\n') if buffer: - os.write(self._pipe, ''.join(buffer)) + os.write(self._pipe, _unicode_encode(''.join(buffer))) =20 def treewalk(self, srcroot, destroot, inforoot, myebuild, cleanup=3D0, mydbapi=3DNone, prev_mtimes=3DNone):