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 89E13138334 for ; Fri, 13 Dec 2019 23:05:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 961DDE0933; Fri, 13 Dec 2019 23:05:57 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 770F6E0933 for ; Fri, 13 Dec 2019 23:05:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 0C07834D97E for ; Fri, 13 Dec 2019 23:05:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88C438B1 for ; Fri, 13 Dec 2019 23:05:54 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1576278345.04b60e2a0821f5fff13d05d8b6fc05ea7cc697d1.gyakovlev@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.39.0.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 04b60e2a0821f5fff13d05d8b6fc05ea7cc697d1 X-VCS-Branch: master Date: Fri, 13 Dec 2019 23:05:54 +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: ceb96f78-af6a-4013-b54d-8f126b8e153b X-Archives-Hash: ee0989a2ee34940bba50e93da8bbc4a9 commit: 04b60e2a0821f5fff13d05d8b6fc05ea7cc697d1 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Dec 13 19:56:47 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Dec 13 23:05:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b60e2a dev-lang/rust: fix completion file removal Bug: https://bugs.gentoo.org/689562 Package-Manager: Portage-2.3.79, Repoman-2.3.17 Signed-off-by: Georgy Yakovlev gentoo.org> dev-lang/rust/rust-1.39.0.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-lang/rust/rust-1.39.0.ebuild b/dev-lang/rust/rust-1.39.0.ebuild index f918098e20c..6f66984bd72 100644 --- a/dev-lang/rust/rust-1.39.0.ebuild +++ b/dev-lang/rust/rust-1.39.0.ebuild @@ -236,7 +236,9 @@ src_install() { # bug #689562, #689160 rm "${D}/etc/bash_completion.d/cargo" || die - rmdir -p "${D}/etc" || die + pushd "${D}" > /dev/null || die + rmdir -p etc/bash_completion.d || die + popd > /dev/null || die dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die