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 C3796138010 for ; Sat, 15 Sep 2012 20:36:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7AA2F21C05A; Sat, 15 Sep 2012 20:35:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4251E21C05A for ; Sat, 15 Sep 2012 20:35:51 +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 A73D133D2A8 for ; Sat, 15 Sep 2012 20:35:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 46C0FE5446 for ; Sat, 15 Sep 2012 20:35:48 +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: <1347741248.08806f2a29db0d9c182ab5b54a6943b3ebb65f0d.ulm@gentoo> Subject: [gentoo-commits] proj/eselect:master commit in: libs/, /, modules/ X-VCS-Repository: proj/eselect X-VCS-Files: ChangeLog libs/editor-variable.bash.in modules/locale.eselect X-VCS-Directories: libs/ / modules/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller X-VCS-Revision: 08806f2a29db0d9c182ab5b54a6943b3ebb65f0d X-VCS-Branch: master Date: Sat, 15 Sep 2012 20:35:48 +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: 5f3c35f0-442c-4714-a95c-d2e3970e582a X-Archives-Hash: 1c32aa66e4ff8be67a9287b19c4dda21 commit: 08806f2a29db0d9c182ab5b54a6943b3ebb65f0d Author: Ulrich Müller gentoo org> AuthorDate: Sat Sep 15 20:34:08 2012 +0000 Commit: Ulrich Mueller gentoo org> CommitDate: Sat Sep 15 20:34:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=08806f2a Prefix /etc/profile with EROOT in output message, bug 429960. * libs/editor-variable.bash.in (do_set): * modules/locale.eselect (do_set): Output message only if ROOT is /, and prefix /etc/profile with EROOT, bug 429960. --- ChangeLog | 4 ++++ libs/editor-variable.bash.in | 3 ++- modules/locale.eselect | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f610f77..eadc072 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-09-15 Ulrich Müller + * libs/editor-variable.bash.in (do_set): + * modules/locale.eselect (do_set): Output message only if ROOT + is /, and prefix /etc/profile with EROOT, bug 429960. + * bin/eselect.in (EROOT): Remove trailing slash from ROOT only if EPREFIX is set. This guarantees that EROOT is equal to ROOT for empty EPREFIX. diff --git a/libs/editor-variable.bash.in b/libs/editor-variable.bash.in index a431a4f..a8d4252 100644 --- a/libs/editor-variable.bash.in +++ b/libs/editor-variable.bash.in @@ -155,7 +155,8 @@ do_set() { # update profile do_action env update noldconfig - echo "Run \". /etc/profile\" to update the variable in your shell." + [[ ${ROOT:-/} = / ]] && echo \ + "Run \". ${EROOT}/etc/profile\" to update the variable in your shell." } ### update action ### diff --git a/modules/locale.eselect b/modules/locale.eselect index cb19f63..49b4826 100644 --- a/modules/locale.eselect +++ b/modules/locale.eselect @@ -125,5 +125,6 @@ do_set() { # update profile do_action env update noldconfig - echo "Run \". /etc/profile\" to update the variable in your shell." + [[ ${ROOT:-/} = / ]] && echo \ + "Run \". ${EROOT}/etc/profile\" to update the variable in your shell." }