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 94F591382C5 for ; Mon, 21 Dec 2020 12:22:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA60C2BC05F; Mon, 21 Dec 2020 12:22:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 75D5E2BC05F for ; Mon, 21 Dec 2020 12:22:36 +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 28C60340F41 for ; Mon, 21 Dec 2020 12:22:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F34CCC for ; Mon, 21 Dec 2020 12:22:33 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1608553346.6a7ff6155c5dce32c19e448e2e473b0f0d791f64.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/rust-1.48.0.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 6a7ff6155c5dce32c19e448e2e473b0f0d791f64 X-VCS-Branch: master Date: Mon, 21 Dec 2020 12:22:33 +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: 8c5a0f72-7602-4d22-8bc2-dd1bb0db0a6c X-Archives-Hash: 65d45f04a954dc30729a4145ba6b691e commit: 6a7ff6155c5dce32c19e448e2e473b0f0d791f64 Author: Benda Xu gentoo org> AuthorDate: Mon Dec 21 12:21:35 2020 +0000 Commit: Benda XU gentoo org> CommitDate: Mon Dec 21 12:22:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7ff615 dev-lang/rust: use ED in removal operations. This does not affect non-prefix systems and the prefix systems fail to install before this commit. Therefore, no revision is is required. Bug: https://bugs.gentoo.org/689562 Bug: https://bugs.gentoo.org/689160 Package-Manager: Portage-3.0.12, Repoman-3.0.1 Signed-off-by: Benda Xu gentoo.org> dev-lang/rust/rust-1.48.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-lang/rust/rust-1.48.0.ebuild b/dev-lang/rust/rust-1.48.0.ebuild index 19da77c7c39..779372ba4e6 100644 --- a/dev-lang/rust/rust-1.48.0.ebuild +++ b/dev-lang/rust/rust-1.48.0.ebuild @@ -510,8 +510,8 @@ src_install() { ) # bug #689562, #689160 - rm -v "${D}/usr/lib/${PN}/${PV}/etc/bash_completion.d/cargo" || die - rmdir -v "${D}/usr/lib/${PN}/${PV}"/etc{/bash_completion.d,} || die + rm -v "${ED}/usr/lib/${PN}/${PV}/etc/bash_completion.d/cargo" || die + rmdir -v "${ED}/usr/lib/${PN}/${PV}"/etc{/bash_completion.d,} || die dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo local symlinks=(