From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 21 Dec 2007 02:51:14 +0000 (-0000)
Subject: Tweak profile validation and warning logic a bit. (trunk r9015)
X-Git-Tag: v2.1.4~65
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dccc1676525d274cd4c8b8204825e0193860a5ba;p=portage.git

Tweak profile validation and warning logic a bit. (trunk r9015)

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

diff --git a/bin/emerge b/bin/emerge
index cf75f877e..a762968d3 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -6293,7 +6293,9 @@ def parse_opts(tmpcmdline, silent=False):
 	return myaction, myopts, myfiles
 
 def validate_ebuild_environment(trees):
-	pass
+	for myroot in trees:
+		settings = trees[myroot]["vartree"].settings
+		settings.validate()
 
 def load_emerge_config(trees=None):
 	kwargs = {}
diff --git a/pym/portage.py b/pym/portage.py
index 0f5b2ca26..13ba9324c 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1724,9 +1724,9 @@ class config:
 
 		abs_profile_path = os.path.join(self["PORTAGE_CONFIGROOT"],
 			PROFILE_PATH.lstrip(os.path.sep))
-		if not os.path.islink(abs_profile_path) and \
+		if not self.profile_path or (not os.path.islink(abs_profile_path) and \
 			not os.path.exists(os.path.join(abs_profile_path, "parent")) and \
-			os.path.exists(os.path.join(self["PORTDIR"], "profiles")):
+			os.path.exists(os.path.join(self["PORTDIR"], "profiles"))):
 			writemsg("\a\n\n!!! %s is not a symlink and will probably prevent most merges.\n" % abs_profile_path,
 				noiselevel=-1)
 			writemsg("!!! It should point into a profile within %s/profiles/\n" % self["PORTDIR"])
@@ -9823,7 +9823,6 @@ def create_trees(config_root=None, target_root=None, trees=None):
 	settings = config(config_root=config_root, target_root=target_root,
 		config_incrementals=portage_const.INCREMENTALS)
 	settings.lock()
-	settings.validate()
 
 	myroots = [(settings["ROOT"], settings)]
 	if settings["ROOT"] != "/":
@@ -9849,7 +9848,6 @@ def create_trees(config_root=None, target_root=None, trees=None):
 				backupenv.pop(k, None)
 		settings.regenerate()
 		settings.lock()
-		settings.validate()
 		myroots.append((settings["ROOT"], settings))
 
 	for myroot, mysettings in myroots: