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 1Q0ICB-0000wV-Tt for garchives@archives.gentoo.org; Thu, 17 Mar 2011 18:45:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EAED81C056; Thu, 17 Mar 2011 18:44:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BC9251C056 for ; Thu, 17 Mar 2011 18:44:38 +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 29AD41B40B9 for ; Thu, 17 Mar 2011 18:44:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 824C28006A for ; Thu, 17 Mar 2011 18:44:37 +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: <730b33af5ab9e2b7efd2ee4928a1d635dfefaab0.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dep/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dep/dep_check.py X-VCS-Directories: pym/portage/dep/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 730b33af5ab9e2b7efd2ee4928a1d635dfefaab0 Date: Thu, 17 Mar 2011 18:44:37 +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: 75f2216db8d447f0d553d7171952fc5a commit: 730b33af5ab9e2b7efd2ee4928a1d635dfefaab0 Author: Zac Medico gentoo org> AuthorDate: Thu Mar 17 18:39:28 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Mar 17 18:39:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D730b33af dep_check: return errors as unicode This should prevent the following error due to returning raw bytes, reported in forum thread #869281: File "pym/_emerge/BlockerDB.py", line 72, in findInstalledBlockers portage.writemsg("!!! %s/*DEPEND: %s\n" % \ (pkg_location, atoms), noiselevel=3D-1) UnicodeDecodeError: 'ascii' codec can't decode byte 0xef in position 23: ordinal not in range(128) --- pym/portage/dep/dep_check.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index 4d26f51..7ec01fa 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -6,6 +6,7 @@ __all__ =3D ['dep_check', 'dep_eval', 'dep_wordreduce', '= dep_zapdeps'] import logging =20 import portage +from portage import _unicode_decode from portage.dep import Atom, match_from_list, use_reduce from portage.exception import InvalidDependString, ParseError from portage.localization import _ @@ -173,8 +174,8 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, my= settings, myroot=3D"/", del mytrees["virt_parent"] =20 if not mycheck[0]: - raise ParseError( - "%s: %s '%s'" % (pkg, mycheck[1], depstring)) + raise ParseError(_unicode_decode("%s: %s '%s'") % \ + (pkg, mycheck[1], depstring)) =20 # pull in the new-style virtual mycheck[1].append(virt_atom) @@ -587,7 +588,7 @@ def dep_check(depstring, mydbapi, mysettings, use=3D"= yes", mode=3DNone, myuse=3DNone, matchall=3D(use=3D=3D"all"), excludeall=3Duseforce, opconvert=3DTrue,= \ token_class=3DAtom, eapi=3Deapi) except InvalidDependString as e: - return [0, str(e)] + return [0, _unicode_decode("%s") % (e,)] =20 if mysplit =3D=3D []: #dependencies were reduced to nothing @@ -601,7 +602,7 @@ def dep_check(depstring, mydbapi, mysettings, use=3D"= yes", mode=3DNone, myuse=3DNone, use_force=3Duseforce, use_mask=3Dmymasks, use_cache=3Duse_cache, use_binaries=3Duse_binaries, myroot=3Dmyroot, trees=3Dtrees) except ParseError as e: - return [0, str(e)] + return [0, _unicode_decode("%s") % (e,)] =20 mysplit2=3Dmysplit[:] mysplit2=3Ddep_wordreduce(mysplit2,mysettings,mydbapi,mode,use_cache=3D= use_cache)