From f361d47a0095736c3a8b099fa3dec60a342be9fe Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 22 Nov 2006 13:01:11 +0000 Subject: =?UTF-8?q?Fix=20a=20KeyError=20in=20emerge=20--info=20=20whe?= =?UTF-8?q?n=20there=20is=20no=20matching=20ebuild=20in=20the=20tree.=20?= =?UTF-8?q?=20Thanks=20to=20Bo=20=C3=98rsted=20Andresen=20=20for=20reporting.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/main/trunk/; revision=5118 --- bin/emerge | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index 9f3d38670..92c5b98fe 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3792,7 +3792,13 @@ def action_info(settings, trees, myopts, myfiles): valuesmap["IUSE"] = set(filter_iuse_defaults(valuesmap["IUSE"])) valuesmap["USE"] = valuesmap["USE"].intersection(valuesmap["IUSE"]) pkgsettings.reset() - pkgsettings.setcpv(pkg, mydb=portdb) + # If a matching ebuild is no longer available in the tree, maybe it + # would make sense to compare against the flags for the best + # available version with the same slot? + mydb = None + if portdb.cpv_exists(pkg): + mydb = portdb + pkgsettings.setcpv(pkg, mydb=mydb) if valuesmap["IUSE"].intersection(pkgsettings["USE"].split()) != \ valuesmap["USE"]: diff_values["USE"] = valuesmap["USE"] -- cgit v1.2.3-1-g7c22