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 2F032138334 for ; Sun, 11 Aug 2019 06:40:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2A72E083D; Sun, 11 Aug 2019 06:40:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 CAD3DE083D for ; Sun, 11 Aug 2019 06:40:38 +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 31D1F34989A for ; Sun, 11 Aug 2019 06:40:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E97F758 for ; Sun, 11 Aug 2019 06:40:35 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1565505631.35b59df9c14228d1be3989516dedd51ea4bafbad.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/python-exec/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/python-exec/python-exec-2.4.6-r1.ebuild dev-lang/python-exec/python-exec-9999.ebuild X-VCS-Directories: dev-lang/python-exec/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 35b59df9c14228d1be3989516dedd51ea4bafbad X-VCS-Branch: master Date: Sun, 11 Aug 2019 06:40:35 +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: 8aadf5c3-59e3-4dbf-bdc6-455687f2cfa1 X-Archives-Hash: 6364648f1ec430ba30c3af7ce9bfccd3 commit: 35b59df9c14228d1be3989516dedd51ea4bafbad Author: Michał Górny gentoo org> AuthorDate: Sun Aug 11 06:39:35 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Aug 11 06:40:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b59df9 dev-lang/python-exec: Fix missing slashes Reported-by: Tim Harder gentoo.org> Signed-off-by: Michał Górny gentoo.org> dev-lang/python-exec/python-exec-2.4.6-r1.ebuild | 12 ++++++------ dev-lang/python-exec/python-exec-9999.ebuild | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild index b40c64f6530..caee841df07 100644 --- a/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild +++ b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild @@ -61,14 +61,14 @@ src_install() { } pkg_preinst() { - if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then + if [[ -e ${EROOT}/etc/python-exec/python-exec.conf ]]; then # preserve current configuration - cp "${EROOT}"etc/python-exec/python-exec.conf \ - "${ED}"etc/python-exec/python-exec.conf || die + cp "${EROOT}"/etc/python-exec/python-exec.conf \ + "${ED}"/etc/python-exec/python-exec.conf || die else # preserve previous Python version preference local py old_pythons=() - local config_base=${EROOT}etc/env.d/python + local config_base=${EROOT}/etc/env.d/python # start with the 'global' preference (2 vs 3) if [[ -f ${config_base}/config ]]; then @@ -115,14 +115,14 @@ pkg_preinst() { elog "you may want to modify the preference list yourself. In order to do so," elog "open the following file in your favorite editor:" elog - elog " ${EROOT}etc/python-exec/python-exec.conf" + elog " ${EROOT}/etc/python-exec/python-exec.conf" elog elog "For more information on the new configuration format, please read" elog "the comment on top of the installed configuration file." local IFS=$'\n' echo "${old_pythons[*]}" \ - >> "${ED}"etc/python-exec/python-exec.conf || die + >> "${ED}"/etc/python-exec/python-exec.conf || die fi fi } diff --git a/dev-lang/python-exec/python-exec-9999.ebuild b/dev-lang/python-exec/python-exec-9999.ebuild index 95c958dd98e..f5c7a17a180 100644 --- a/dev-lang/python-exec/python-exec-9999.ebuild +++ b/dev-lang/python-exec/python-exec-9999.ebuild @@ -67,14 +67,14 @@ src_install() { } pkg_preinst() { - if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then + if [[ -e ${EROOT}/etc/python-exec/python-exec.conf ]]; then # preserve current configuration - cp "${EROOT}"etc/python-exec/python-exec.conf \ - "${ED}"etc/python-exec/python-exec.conf || die + cp "${EROOT}"/etc/python-exec/python-exec.conf \ + "${ED}"/etc/python-exec/python-exec.conf || die else # preserve previous Python version preference local py old_pythons=() - local config_base=${EROOT}etc/env.d/python + local config_base=${EROOT}/etc/env.d/python # start with the 'global' preference (2 vs 3) if [[ -f ${config_base}/config ]]; then @@ -121,14 +121,14 @@ pkg_preinst() { elog "you may want to modify the preference list yourself. In order to do so," elog "open the following file in your favorite editor:" elog - elog " ${EROOT}etc/python-exec/python-exec.conf" + elog " ${EROOT}/etc/python-exec/python-exec.conf" elog elog "For more information on the new configuration format, please read" elog "the comment on top of the installed configuration file." local IFS=$'\n' echo "${old_pythons[*]}" \ - >> "${ED}"etc/python-exec/python-exec.conf || die + >> "${ED}"/etc/python-exec/python-exec.conf || die fi fi }