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 CF2B0138A2E for ; Thu, 14 Feb 2013 16:32:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39591E0586; Thu, 14 Feb 2013 16:32:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93CD2E0586 for ; Thu, 14 Feb 2013 16:32:06 +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 B039433E64E for ; Thu, 14 Feb 2013 16:32:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5953CE407B for ; Thu, 14 Feb 2013 16:32:04 +0000 (UTC) From: "Denis Dupeyron" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Denis Dupeyron" Message-ID: <1360859490.68b75e8da7291f48da953d94b7dfdfbd56cdc857.calchan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/alternatives-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: calchan X-VCS-Committer-Name: Denis Dupeyron X-VCS-Revision: 68b75e8da7291f48da953d94b7dfdfbd56cdc857 X-VCS-Branch: master Date: Thu, 14 Feb 2013 16:32:04 +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: a1a07355-9619-4d29-8065-05897bf804d9 X-Archives-Hash: 6a65edc493d41033869d3319b4dc53b4 commit: 68b75e8da7291f48da953d94b7dfdfbd56cdc857 Author: Denis Dupeyron gentoo org> AuthorDate: Thu Feb 14 16:31:30 2013 +0000 Commit: Denis Dupeyron gentoo org> CommitDate: Thu Feb 14 16:31:30 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=68b75e8d Fix probable trailing / in EROOT --- eclass/alternatives-2.eclass | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eclass/alternatives-2.eclass b/eclass/alternatives-2.eclass index 16caa51..7908fe2 100644 --- a/eclass/alternatives-2.eclass +++ b/eclass/alternatives-2.eclass @@ -95,7 +95,7 @@ alternatives_for() { } cleanup_old_alternatives_module() { - local alt=${1} old_module="${EROOT}/usr/share/eselect/modules/${alt}.eselect" + local alt=${1} old_module="${EROOT%/}/usr/share/eselect/modules/${alt}.eselect" if [[ -f "${old_module}" && "$(source "${old_module}" &>/dev/null; echo "${ALTERNATIVE}")" == "${alt}" ]]; then local version="$(source "${old_module}" &>/dev/null; echo "${VERSION}")" if [[ "${version}" == "0.1" || "${version}" == "20080924" ]]; then @@ -110,14 +110,14 @@ alternatives-2_pkg_postinst() { for a in "${ALTERNATIVES_PROVIDED[@]}"; do alt="${a%:*}" provider="${a#*:}" - if [[ ! -f "${EROOT}/usr/share/eselect/modules/auto/${alt}.eselect" \ - || "$(source "${EROOT}/usr/share/eselect/modules/auto/${alt}.eselect" &>/dev/null; echo "${VERSION}")" \ + if [[ ! -f "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" \ + || "$(source "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" &>/dev/null; echo "${VERSION}")" \ -ne "${module_version}" ]]; then #einfo "Creating alternatives module for ${alt}" - if [[ ! -d ${EROOT}/usr/share/eselect/modules/auto ]]; then - install -d "${EROOT}"/usr/share/eselect/modules/auto || eerror "Could not create eselect modules dir" + if [[ ! -d ${EROOT%/}/usr/share/eselect/modules/auto ]]; then + install -d "${EROOT%/}"/usr/share/eselect/modules/auto || eerror "Could not create eselect modules dir" fi - cat > "${EROOT}/usr/share/eselect/modules/auto/${alt}.eselect" <<-EOF + cat > "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" <<-EOF # This module was automatically generated by alternatives.eclass DESCRIPTION="Alternatives for ${alt}" VERSION="${module_version}" @@ -150,9 +150,9 @@ alternatives-2_pkg_prerm() { einfo "Removed ${provider} alternative module for ${alt}, current is $(eselect ${alt} show)" if [[ $? -eq 2 ]]; then einfo "Cleaning up unused alternatives module for ${alt}" - echo rm "${EROOT}/usr/share/eselect/modules/auto/${alt}.eselect" - rm "${EROOT}/usr/share/eselect/modules/auto/${alt}.eselect" || - eerror rm "${EROOT}/usr/share/eselect/modules/auto/${alt}.eselect" failed + echo rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" + rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" || + eerror rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" failed fi done }