From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 3 May 2008 22:42:24 +0000 (-0000)
Subject: Return early from create_world_atom() if an atom matching the package
X-Git-Tag: v2.1.5~76
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4c00b94a59899dc6012e7be67a99f49d00711aaf;p=portage.git

Return early from create_world_atom() if an atom matching the package
can't be found for some reason.

svn path=/main/branches/2.1.2/; revision=10144
---

diff --git a/bin/emerge b/bin/emerge
index 80cdaf737..507792962 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -913,6 +913,8 @@ def create_world_atom(pkg_key, metadata, args_set, root_config):
 	be greedy with respect to slots.  Unslotted system packages will not be
 	stored in world."""
 	arg_atom = args_set.findAtomForPackage(pkg_key, metadata)
+	if not arg_atom:
+		return None
 	cp = portage.dep_getkey(arg_atom)
 	new_world_atom = cp
 	sets = root_config.sets