From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 14 Jan 2007 22:03:17 +0000 (-0000)
Subject: Don't warn about /etc/make.profile not being a symlink if it has a parent file.
X-Git-Tag: v2.1.2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0f698d2ff3ab9ac2e900dbf85ff620a153049f52;p=portage.git

Don't warn about /etc/make.profile not being a symlink if it has a parent file.

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

diff --git a/pym/portage.py b/pym/portage.py
index 681fb8d0f..76a77e38e 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1513,6 +1513,7 @@ 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 \
+			not os.path.exists(os.path.join(abs_profile_path, "parent")) and \
 			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)