diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-16 03:34:08 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-16 03:34:08 -0700 |
| commit | 5805d06ee0b18114b23bbc2a9a4acff72c350e5c (patch) | |
| tree | fd014acd4d9499156e93da987f4f41975790fd28 | |
| parent | 0306829db1482cb0696e94aacc52bb7396f37e9f (diff) | |
| download | portage-5805d06ee0b18114b23bbc2a9a4acff72c350e5c.tar.gz portage-5805d06ee0b18114b23bbc2a9a4acff72c350e5c.tar.bz2 portage-5805d06ee0b18114b23bbc2a9a4acff72c350e5c.zip | |
Bug #337603 - Fix invalid '/etc/make.profile is not a symlink' message
displayed when /etc/portage/make.profile is perfectly valid.
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 6 |
1 files 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"]) |