From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6775B138010 for ; Wed, 12 Sep 2012 22:10:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE53A21C03F; Wed, 12 Sep 2012 22:09:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7425521C03F for ; Wed, 12 Sep 2012 22:09:10 +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 D760D33CE37 for ; Wed, 12 Sep 2012 22:09:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 86A6BE543F for ; Wed, 12 Sep 2012 22:09:08 +0000 (UTC) From: "Ulrich Mueller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Mueller" Message-ID: <1347487614.faa7f7a2e573c1484a53aa9148683b1c41152730.ulm@gentoo> Subject: [gentoo-commits] proj/eselect:master commit in: /, modules/ X-VCS-Repository: proj/eselect X-VCS-Files: ChangeLog modules/profile.eselect X-VCS-Directories: / modules/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller X-VCS-Revision: faa7f7a2e573c1484a53aa9148683b1c41152730 X-VCS-Branch: master Date: Wed, 12 Sep 2012 22:09:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e2d07302-a19d-4da9-b849-5cfd7e5d76da X-Archives-Hash: d296bb4b32fd3310a418556d842ff89e commit: faa7f7a2e573c1484a53aa9148683b1c41152730 Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 12 22:06:54 2012 +0000 Commit: Ulrich Mueller gentoo org> CommitDate: Wed Sep 12 22:06:54 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=faa7f7a2 Prefer /etc/portage/make.profile. * modules/profile.eselect (get_symlink_location): When both /etc/make.profile and /etc/portage/make.profile exist, prefer the latter. This follows the change of the default location in Portage and in stages. --- ChangeLog | 7 +++++++ modules/profile.eselect | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c98618..d031f48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-09-12 Ulrich Müller + + * modules/profile.eselect (get_symlink_location): When both + /etc/make.profile and /etc/portage/make.profile exist, prefer the + latter. This follows the change of the default location in Portage + and in stages. + 2012-08-19 Ulrich Müller * modules/binutils.eselect (switch_profile): Fix typo in diff --git a/modules/profile.eselect b/modules/profile.eselect index d0acdf7..39794d9 100644 --- a/modules/profile.eselect +++ b/modules/profile.eselect @@ -15,14 +15,14 @@ get_symlink_location() { local oldloc=${EROOT%/}/etc/make.profile local newloc=${EROOT%/}/etc/portage/make.profile + MAKE_PROFILE=${newloc} if [[ -e ${oldloc} ]]; then - MAKE_PROFILE=${oldloc} if [[ -e ${newloc} ]]; then write_warning_msg "Both ${oldloc} and ${newloc} exist." write_warning_msg "Using ${MAKE_PROFILE} for now." + else + MAKE_PROFILE=${oldloc} fi - else - MAKE_PROFILE=${newloc} fi }