From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3B21D138335 for ; Thu, 21 Feb 2019 10:29:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F3F7E085D; Thu, 21 Feb 2019 10:29:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBC6FE085B for ; Thu, 21 Feb 2019 10:29:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E6E3335D3E for ; Thu, 21 Feb 2019 10:29:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4FFAF54F for ; Thu, 21 Feb 2019 10:29:50 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1550744949.c317f1194eeb7e9b10fa7f8845b62d0d575a1733.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/webapp.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c317f1194eeb7e9b10fa7f8845b62d0d575a1733 X-VCS-Branch: master Date: Thu, 21 Feb 2019 10:29:50 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 496a71f2-e01c-42fa-ba6e-bac083411fa6 X-Archives-Hash: 9149b62ae35d25cedec0a905335a463b commit: c317f1194eeb7e9b10fa7f8845b62d0d575a1733 Author: Conrad Kostecki kostecki com> AuthorDate: Tue Feb 19 21:03:09 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 21 10:29:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c317f119 eclass/webapp.eclass: fix install with EAPI=7 Starting with EAPI=7 the ROOT variable does not contain any trailing slash anymore, so it need's to be adjusted to work with EAPI=7, while maintaining compatibility with older EAPI. Closes: https://bugs.gentoo.org/671258 Signed-off-by: Conrad Kostecki kostecki.com> Closes: https://github.com/gentoo/gentoo/pull/11112 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/webapp.eclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass index 8983af334ab..e11835735ca 100644 --- a/eclass/webapp.eclass +++ b/eclass/webapp.eclass @@ -42,9 +42,9 @@ IS_REPLACE=0 INSTALL_CHECK_FILE="installed_by_webapp_eclass" SETUP_CHECK_FILE="setup_by_webapp_eclass" -ETC_CONFIG="${ROOT}etc/vhosts/webapp-config" -WEBAPP_CONFIG="${ROOT}usr/sbin/webapp-config" -WEBAPP_CLEANER="${ROOT}usr/sbin/webapp-cleaner" +ETC_CONFIG="${ROOT%/}/etc/vhosts/webapp-config" +WEBAPP_CONFIG="${ROOT%/}/usr/sbin/webapp-config" +WEBAPP_CLEANER="${ROOT%/}/usr/sbin/webapp-cleaner" # ============================================================================== # INTERNAL FUNCTIONS @@ -365,7 +365,7 @@ webapp_src_preinst() { # @DESCRIPTION: # The default pkg_setup() for this eclass. This will gather required variables # from webapp-config and check if there is an application installed to -# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. +# `${ROOT%/}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. # # You need to call this function BEFORE anything else has run in your custom # pkg_setup(). @@ -389,7 +389,7 @@ webapp_pkg_setup() { G_HOSTNAME="localhost" webapp_read_config - local my_dir="${ROOT}${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}" + local my_dir="${ROOT%/}/${VHOST_ROOT}/${MY_HTDOCSBASE}/${PN}" # if USE=vhosts is enabled OR no application is installed we're done here if ! has vhosts ${IUSE} || use vhosts || [[ ! -d "${my_dir}" ]]; then @@ -453,7 +453,7 @@ webapp_src_install() { # @FUNCTION: webapp_pkg_postinst # @DESCRIPTION: # The default pkg_postinst() for this eclass. This installs the web application to -# `${ROOT}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. Otherwise +# `${ROOT%/}/var/www/localhost/htdocs/${PN}/' if USE=vhosts is not set. Otherwise # display a short notice how to install this application with webapp-config. # # You need to call this function AFTER everything else has run in your custom @@ -464,7 +464,7 @@ webapp_pkg_postinst() { webapp_read_config # sanity checks, to catch bugs in the ebuild - if [[ ! -f "${ROOT}${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]]; then + if [[ ! -f "${ROOT%/}/${MY_APPDIR}/${INSTALL_CHECK_FILE}" ]]; then eerror eerror "This ebuild did not call webapp_src_install() at the end" eerror "of the src_install() function"