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 1Poq73-00085h-6R for garchives@archives.gentoo.org; Mon, 14 Feb 2011 04:32:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D7B9E09A9; Mon, 14 Feb 2011 04:31:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5E961E09A9 for ; Mon, 14 Feb 2011 04:31:40 +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 288DF1B420A for ; Mon, 14 Feb 2011 04:31:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8CBDF8006D for ; Mon, 14 Feb 2011 04:31:39 +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: Subject: [gentoo-commits] proj/portage:2.1.9 commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/bintree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b4fdd78bb0e61c5cca3a55b23fdd2ac3b5141543 Date: Mon, 14 Feb 2011 04:31:39 +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: 81bb934d2fc59b2137474f3854b6905e commit: b4fdd78bb0e61c5cca3a55b23fdd2ac3b5141543 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 14 03:59:24 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 14 04:30:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Db4fdd78b Fix unhandled FileNotFound from previous commit. There is an existing handler for EnvironmentError, so raise that instead of FileNotFound. --- pym/portage/dbapi/bintree.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index 0271bfa..29c8783 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -807,7 +807,7 @@ class binarytree(object): success =3D portage.getbinpkg.file_get(url, tmp_dirname, fcmd=3Dfcmd, filename=3Dtmp_basename) if not success: - raise portage.exception.FileNotFound(url) + raise EnvironmentError("%s failed" % (setting,)) f =3D open(tmp_filename, 'rb') =20 f_dec =3D codecs.iterdecode(f,