From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 7 Dec 2007 05:33:52 +0000 (-0000)
Subject: Remove automatic "system" and "world" set creation since we can
X-Git-Tag: v2.2_pre1~213
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1a9d31c2f070851f7a31a43e6cc291f477d5f0e9;p=portage.git

Remove automatic "system" and "world" set creation since we can
probably rely on having a complete config.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a6679f429..9458882af 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -6911,15 +6911,6 @@ def emerge_main():
 		sets = setconfig.getSets()
 		# emerge relies on the existance of sets with names "world" and "system"
 		required_sets = ("world", "system")
-		if "system" not in sets:
-			# bootstrap.sh expects that this set always exists
-			from portage.sets.profiles import PackagesSystemSet
-			sets["system"] = PackagesSystemSet(root_config.settings.profiles)
-		if "world" not in sets:
-			from portage.sets.files import WorldSet
-			sets["world"] = WorldSet(root_config.root)
-		setconfig.psets.update(sets)
-		root_config.sets = sets
 		for s in required_sets:
 			if s not in sets:
 				msg = ["emerge: incomplete set configuration, " + \