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 1R3sFp-0001MO-6g for garchives@archives.gentoo.org; Wed, 14 Sep 2011 16:24:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88D6821C15E; Wed, 14 Sep 2011 16:23:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4C83621C15E for ; Wed, 14 Sep 2011 16:23:35 +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 9FD2C1B404F for ; Wed, 14 Sep 2011 16:23:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0112F80042 for ; Wed, 14 Sep 2011 16:23:34 +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: <275134399b75d5f6740954c942dbb3921b9828e8.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/digestgen.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 275134399b75d5f6740954c942dbb3921b9828e8 Date: Wed, 14 Sep 2011 16:23:34 +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: 873f9d7ed2e0d4a316b88e80c626019c commit: 275134399b75d5f6740954c942dbb3921b9828e8 Author: Zac Medico gentoo org> AuthorDate: Wed Sep 14 16:23:18 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Sep 14 16:23:18 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D27513439 digestgen: handle get_repo_for_location KeyError --- pym/portage/package/ebuild/digestgen.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/pym/portage/package/ebuild/digestgen.py b/pym/portage/packag= e/ebuild/digestgen.py index 7b58972..325fc52 100644 --- a/pym/portage/package/ebuild/digestgen.py +++ b/pym/portage/package/ebuild/digestgen.py @@ -52,7 +52,13 @@ def digestgen(myarchives=3DNone, mysettings=3DNone, my= portdb=3DNone): del e return 0 mytree =3D os.path.dirname(os.path.dirname(mysettings["O"])) - mf =3D mysettings.repositories.get_repo_for_location(mytree) + try: + mf =3D mysettings.repositories.get_repo_for_location(mytree) + except KeyError: + # backward compatibility + mytree =3D os.path.realpath(mytree) + mf =3D mysettings.repositories.get_repo_for_location(mytree) + mf =3D mf.load_manifest(mysettings["O"], mysettings["DISTDIR"], fetchlist_dict=3Dfetchlist_dict) # Don't require all hashes since that can trigger excessive