From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 6 Nov 2007 06:54:41 +0000 (-0000)
Subject: Fix create_world_atom() logic some more for bug #198129.
X-Git-Tag: v2.2_pre1~434
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6417607e0ca5b90a9037de92eb28f9a09ff29aa9;p=portage.git

Fix create_world_atom() logic some more for bug #198129.

svn path=/main/trunk/; revision=8439
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 67f8d7306..4733f43f0 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -652,7 +652,10 @@ def create_world_atom(pkg_key, metadata, args_set, root_config):
 		if not portdb.match(slot_atom):
 			# SLOT seems to come from an installed multislot package
 			mydb = vardb
-		if mydb.match(slot_atom):
+		# If there is no installed package matching the SLOT atom,
+		# it probably changed SLOT spontaneously due to USE=multislot,
+		# so just record an unslotted atom.
+		if vardb.match(slot_atom):
 			# Now verify that the argument is precise
 			# enough to identify a specific slot.
 			matches = mydb.match(arg_atom)