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 1R8mfT-00046m-LP for garchives@archives.gentoo.org; Wed, 28 Sep 2011 05:26:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB62F21C109; Wed, 28 Sep 2011 05:26:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9E72C21C109 for ; Wed, 28 Sep 2011 05:26:41 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 248811B400D for ; Wed, 28 Sep 2011 05:26:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 311B780042 for ; Wed, 28 Sep 2011 05:26:40 +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: <28ce242ff1bf55605227b1877aaba0b76388714c.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 28ce242ff1bf55605227b1877aaba0b76388714c Date: Wed, 28 Sep 2011 05:26:40 +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: c0487c99b841af2631cca7750f6a5c07 commit: 28ce242ff1bf55605227b1877aaba0b76388714c Author: Zac Medico gentoo org> AuthorDate: Wed Sep 28 05:26:27 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Sep 28 05:26:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D28ce242f depgraph: handle unicode exception for bug 384749 --- pym/_emerge/depgraph.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 00d9628..f9f4954 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4480,7 +4480,7 @@ class depgraph(object): # matches (this can happen if an atom lacks a # category). show_invalid_depstring_notice( - pkg, depstr, str(e)) + pkg, depstr, _unicode_decode("%s") % (e,)) del e raise if not success: @@ -4511,7 +4511,8 @@ class depgraph(object): except portage.exception.InvalidAtom as e: depstr =3D " ".join(vardb.aux_get(pkg.cpv, dep_keys)) show_invalid_depstring_notice( - pkg, depstr, "Invalid Atom: %s" % (e,)) + pkg, depstr, + _unicode_decode("Invalid Atom: %s") % (e,)) return False for cpv in stale_cache: del blocker_cache[cpv]