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 67f8d7306386e2604f1a7d89a13690293e756d75..4733f43f0a5b80802732895441ac6a5d0c1a4a87 100644 (file)
--- 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)