From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SUWGi-0008MX-S1 for garchives@archives.gentoo.org; Wed, 16 May 2012 04:55:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B128CE085D; Wed, 16 May 2012 04:55:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 81899E085D for ; Wed, 16 May 2012 04:55:14 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E47761B4048 for ; Wed, 16 May 2012 04:55:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7ECA4E5429 for ; Wed, 16 May 2012 04:55:12 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1337144098.b73cac4bb004da49b8d2075f06529a8c4e5269db.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b73cac4bb004da49b8d2075f06529a8c4e5269db X-VCS-Branch: master Date: Wed, 16 May 2012 04:55:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e05cfe4b-5fe3-41e8-8fcc-ca16e5d1a96d X-Archives-Hash: 34ad745aa042daffd06a5b1a8ae9eec8 commit: b73cac4bb004da49b8d2075f06529a8c4e5269db Author: Zac Medico gentoo org> AuthorDate: Wed May 16 04:54:58 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed May 16 04:54:58 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Db73cac4b config: fix /etc/portage/make.profile error msg --- pym/portage/package/ebuild/config.py | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/e= build/config.py index aa4a62e..97cbd99 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -919,11 +919,26 @@ class config(object): writemsg(_("!!! INVALID ACCEPT_KEYWORDS: %s\n") % str(group), noiselevel=3D-1) =20 - abs_profile_path =3D os.path.join(self["PORTAGE_CONFIGROOT"], - PROFILE_PATH) - 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")): + profile_broken =3D 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")) + + if profile_broken: + abs_profile_path =3D None + for x in (PROFILE_PATH, 'etc/portage/make.profile'): + x =3D os.path.join(self["PORTAGE_CONFIGROOT"], x) + try: + os.lstat(x) + except OSError: + pass + else: + abs_profile_path =3D x + break + + if abs_profile_path is None: + abs_profile_path =3D os.path.join(self["PORTAGE_CONFIGROOT"], + PROFILE_PATH) + writemsg(_("\n\n!!! %s is not a symlink and will probably prevent mos= t merges.\n") % abs_profile_path, noiselevel=3D-1) writemsg(_("!!! It should point into a profile within %s/profiles/\n"= ) % self["PORTDIR"])