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 F346D138334 for ; Sun, 20 Oct 2019 20:27:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A2A1E0CA4; Sun, 20 Oct 2019 20:27:21 +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 0C2EEE0CA4 for ; Sun, 20 Oct 2019 20:27:21 +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 25F1134C0BF for ; Sun, 20 Oct 2019 20:27:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 761927FE for ; Sun, 20 Oct 2019 20:27:18 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1571603229.8e2dcab16c0c3b8432ff6605c218c11dd8a64e61.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/slurm/slurm-19.05.3.2.ebuild X-VCS-Directories: sys-cluster/slurm/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 8e2dcab16c0c3b8432ff6605c218c11dd8a64e61 X-VCS-Branch: master Date: Sun, 20 Oct 2019 20:27:18 +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: 54ce15a6-62da-4e5b-8cbc-cad5b3ac8073 X-Archives-Hash: 8644129a76c78c6f54bbd62d58e97e16 commit: 8e2dcab16c0c3b8432ff6605c218c11dd8a64e61 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Oct 20 20:26:04 2019 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sun Oct 20 20:27:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e2dcab1 sys-cluster/slurm: Add slashes Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-cluster/slurm/slurm-19.05.3.2.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-cluster/slurm/slurm-19.05.3.2.ebuild b/sys-cluster/slurm/slurm-19.05.3.2.ebuild index 58a1775accb..9487d67f72c 100644 --- a/sys-cluster/slurm/slurm-19.05.3.2.ebuild +++ b/sys-cluster/slurm/slurm-19.05.3.2.ebuild @@ -177,7 +177,7 @@ src_install() { fi if use torque; then emake DESTDIR="${D}" -C contribs/torque - rm -f "${ED}/usr/bin/mpiexec" || die + rm -f "${D}"/usr/bin/mpiexec || die fi use static-libs || find "${ED}" -name '*.la' -exec rm {} + # install sample configs @@ -221,7 +221,7 @@ src_install() { pkg_preinst() { if use munge; then - sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${ED}"etc/conf.d/slurm || die + sed -i 's,\(SLURM_USE_MUNGE=\).*,\11,' "${D}"/etc/conf.d/slurm || die fi } @@ -233,11 +233,11 @@ create_folders_and_fix_permissions() { pkg_postinst() { paths=( - "${EROOT}"var/${PN}/checkpoint - "${EROOT}"var/${PN} - "${EROOT}"var/spool/${PN}/slurmd - "${EROOT}"var/spool/${PN} - "${EROOT}"var/log/${PN} + "${EROOT}"/var/${PN}/checkpoint + "${EROOT}"/var/${PN} + "${EROOT}"/var/spool/${PN}/slurmd + "${EROOT}"/var/spool/${PN} + "${EROOT}"/var/log/${PN} /var/tmp/${PN}/${PN}d /var/tmp/${PN} /run/${PN}