From 5805d06ee0b18114b23bbc2a9a4acff72c350e5c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 16 Sep 2010 03:34:08 -0700 Subject: Bug #337603 - Fix invalid '/etc/make.profile is not a symlink' message displayed when /etc/portage/make.profile is perfectly valid. --- pym/portage/package/ebuild/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 8ee93005a..7c1060f12 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -848,9 +848,9 @@ class config(object): abs_profile_path = os.path.join(self["PORTAGE_CONFIGROOT"], PROFILE_PATH) - 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"))): + if (not self.profile_path or \ + not os.path.exists(os.path.join(self.profile_path, "parent"))) and \ + os.path.exists(os.path.join(self["PORTDIR"], "profiles")): writemsg(_("\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"]) -- cgit v1.2.3-1-g7c22