summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-01-14 22:03:17 +0000
committerZac Medico <zmedico@gentoo.org>2007-01-14 22:03:17 +0000
commit0f698d2ff3ab9ac2e900dbf85ff620a153049f52 (patch)
treedec3770384e63f391edd1f1d37def43c1d6c5639
parentDisable the test phase when USE=test is masked (for consistency with the fix ... (diff)
downloadportage-multirepo-0f698d2ff3ab9ac2e900dbf85ff620a153049f52.tar.gz
portage-multirepo-0f698d2ff3ab9ac2e900dbf85ff620a153049f52.tar.bz2
portage-multirepo-0f698d2ff3ab9ac2e900dbf85ff620a153049f52.zip
Don't warn about /etc/make.profile not being a symlink if it has a parent file.
svn path=/main/trunk/; revision=5647
-rw-r--r--pym/portage.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 681fb8d0..76a77e38 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)