diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | libs/editor-variable.bash.in | 3 | ||||
| -rw-r--r-- | modules/locale.eselect | 3 |
3 files changed, 8 insertions, 2 deletions
@@ -1,5 +1,9 @@ 2012-09-15 Ulrich Müller <ulm@gentoo.org> + * 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." } |