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 11DF5138010 for ; Sat, 15 Sep 2012 20:36:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C200A21C029; Sat, 15 Sep 2012 20:35:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 969CF21C029 for ; Sat, 15 Sep 2012 20:35:50 +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 0A3E833D28F 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 CCF55E543F for ; Sat, 15 Sep 2012 20:35:47 +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: <1347732631.78b5fb759016a0b3b0da96137f633c89154d94d6.ulm@gentoo> Subject: [gentoo-commits] proj/eselect:master commit in: /, bin/ X-VCS-Repository: proj/eselect X-VCS-Files: ChangeLog bin/eselect.in X-VCS-Directories: / bin/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller X-VCS-Revision: 78b5fb759016a0b3b0da96137f633c89154d94d6 X-VCS-Branch: master Date: Sat, 15 Sep 2012 20:35:47 +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: 8218a137-65c9-4cfe-b33a-bc03cf7a9d9f X-Archives-Hash: 738d6f738de1a345f9851d67c2e41d18 commit: 78b5fb759016a0b3b0da96137f633c89154d94d6 Author: Ulrich Müller gentoo org> AuthorDate: Sat Sep 15 18:10:31 2012 +0000 Commit: Ulrich Mueller gentoo org> CommitDate: Sat Sep 15 18:10:31 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=78b5fb75 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. --- ChangeLog | 6 ++++++ bin/eselect.in | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8de74a8..f610f77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-09-15 Ulrich Müller + + * 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 * 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.