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 1RGdeB-0001L2-37 for garchives@archives.gentoo.org; Wed, 19 Oct 2011 21:25:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2328621C075; Wed, 19 Oct 2011 21:25:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E854121C075 for ; Wed, 19 Oct 2011 21:25:50 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BFE01B4009 for ; Wed, 19 Oct 2011 21:25:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D185980042 for ; Wed, 19 Oct 2011 21:25:49 +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: <3824bdfdaa848d266320d47f22f27498c3d300b5.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/resolver/output.py X-VCS-Directories: pym/_emerge/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3824bdfdaa848d266320d47f22f27498c3d300b5 Date: Wed, 19 Oct 2011 21:25:49 +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: 639b0ec8f4a8ba1cb739f49e04d018b9 commit: 3824bdfdaa848d266320d47f22f27498c3d300b5 Author: Zac Medico gentoo org> AuthorDate: Wed Oct 19 21:25:35 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Oct 19 21:25:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D3824bdfd resolver/output: display binary fetch size --- pym/_emerge/resolver/output.py | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output= .py index f74d13a..7bfe007 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -15,7 +15,7 @@ from portage import _unicode_decode from portage.dbapi.dep_expand import dep_expand from portage.const import PORTAGE_PACKAGE_ATOM from portage.dep import cpvequal, match_from_list -from portage.exception import InvalidDependString +from portage.exception import InvalidDependString, SignatureException from portage.output import ( blue, bold, colorize, create_color_func, darkblue, darkgreen, green, nc_len, red, teal, turquoise, yellow ) bad =3D create_color_func("BAD") @@ -309,17 +309,26 @@ class Display(object): self.verboseadd, repoadd_set. """ mysize =3D 0 - if pkg.type_name =3D=3D "ebuild" and pkg_info.merge: + if pkg.type_name in ("binary", "ebuild") and pkg_info.merge: + db =3D pkg.root_config.trees[ + pkg.root_config.pkg_tree_map[pkg.type_name]].dbapi + kwargs =3D {} + if pkg.type_name =3D=3D "ebuild": + kwargs["useflags"] =3D pkg_info.use + kwargs["myrepo"] =3D pkg.repo + myfilesdict =3D None try: - myfilesdict =3D self.portdb.getfetchsizes(pkg.cpv, - useflags=3Dpkg_info.use, myrepo=3Dpkg.repo) + myfilesdict =3D db.getfetchsizes(pkg.cpv, **kwargs) except InvalidDependString as e: # FIXME: validate SRC_URI earlier - depstr, =3D self.portdb.aux_get(pkg.cpv, + depstr, =3D db.aux_get(pkg.cpv, ["SRC_URI"], myrepo=3Dpkg.repo) show_invalid_depstring_notice( pkg, depstr, str(e)) raise + except SignatureException: + # missing/invalid binary package SIZE signature + pass if myfilesdict is None: myfilesdict =3D "[empty/missing/bad digest]" else: