diff options
author | Ulrich Müller <ulm@gentoo.org> | 2012-09-15 20:10:31 +0200 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2012-09-15 20:10:31 +0200 |
commit | 78b5fb759016a0b3b0da96137f633c89154d94d6 (patch) | |
tree | 09aa0e54e22ef291873ea40610f7426772e6ea85 | |
parent | Fix typo in ChangeLog: slash, not backslash. (diff) | |
download | eselect-78b5fb759016a0b3b0da96137f633c89154d94d6.tar.gz eselect-78b5fb759016a0b3b0da96137f633c89154d94d6.tar.bz2 eselect-78b5fb759016a0b3b0da96137f633c89154d94d6.zip |
Remove trailing slash from ROOT only if EPREFIX is set.
* 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.
-rw-r--r-- | ChangeLog | 6 | ||||
-rwxr-xr-x | bin/eselect.in | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2012-09-15 Ulrich Müller <ulm@gentoo.org> + + * 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. + 2012-09-13 Ulrich Müller <ulm@gentoo.org> * configure.ac: Update version to 1.3.2. diff --git a/bin/eselect.in b/bin/eselect.in index fb1260f..95bc77e 100755 --- a/bin/eselect.in +++ b/bin/eselect.in @@ -43,7 +43,7 @@ ESELECT_KILL_TARGET="$$" # Support variables for Gentoo Prefix EPREFIX="@EPREFIX@" -EROOT="${ROOT%/}${EPREFIX}" +EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}" # Remove all alias definitions. Unset functions and variables that are # known to cause trouble. |