commit:     04b60e2a0821f5fff13d05d8b6fc05ea7cc697d1
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 19:56:47 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> 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 <gyakovlev <AT> 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

Reply via email to