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 <gentoo-commits+bounces-366111-garchives=archives.gentoo.org@lists.gentoo.org>) id 1Qm1sk-0002hx-MY for garchives@archives.gentoo.org; Wed, 27 Jul 2011 11:02:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D12721C06B for <garchives@archives.gentoo.org>; Wed, 27 Jul 2011 11:02:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5EA3121C042 for <gentoo-commits@lists.gentoo.org>; Wed, 27 Jul 2011 10:34:22 +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 CF1902AC00C for <gentoo-commits@lists.gentoo.org>; Wed, 27 Jul 2011 10:34:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E51B28003D for <gentoo-commits@lists.gentoo.org>; Wed, 27 Jul 2011 10:34:20 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <7bc0f420943278f3efcbb2e33c949c393ab99a09.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: 7bc0f420943278f3efcbb2e33c949c393ab99a09 Date: Wed, 27 Jul 2011 10:34:20 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: b3808d810407027cee79efdae73bbc04 commit: 7bc0f420943278f3efcbb2e33c949c393ab99a09 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Wed Jul 27 10:34:09 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Jul 27 10:34:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7bc0f420 depgraph: handle invalid SRC_URI This is a minimal fix for bug #376577. --- pym/_emerge/resolver/output.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output= .py index 69a30cc..05e316a 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -26,6 +26,7 @@ from _emerge.Blocker import Blocker from _emerge.create_world_atom import create_world_atom from _emerge.resolver.output_helpers import ( _DisplayConfig, _tree_disp= lay, _PackageCounters, _create_use_string, _format_size, _calc_changelog, Pk= gInfo) +from _emerge.show_invalid_depstring_notice import show_invalid_depstring= _notice =20 if sys.hexversion >=3D 0x3000000: basestring =3D str @@ -312,8 +313,12 @@ class Display(object): try: myfilesdict =3D self.portdb.getfetchsizes(pkg.cpv, useflags=3Dpkg_info.use, myrepo=3Dpkg.repo) - except InvalidDependString: - # should have been masked before it was selected + except InvalidDependString as e: + # FIXME: validate SRC_URI earlier + depstr, =3D self.portdb.aux_get(pkg.cpv, + ["SRC_URI"], myrepo=3Dpkg.repo) + show_invalid_depstring_notice( + pkg, depstr, str(e)) raise if myfilesdict is None: myfilesdict =3D "[empty/missing/bad digest]"