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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2ACA315800A for ; Mon, 31 Jul 2023 12:04:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 660F7E0CA5; Mon, 31 Jul 2023 12:04:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 474CFE0CA5 for ; Mon, 31 Jul 2023 12:04:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 40F9133E830 for ; Mon, 31 Jul 2023 12:04:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90B55BEE for ; Mon, 31 Jul 2023 12:04:37 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1690805047.03b9c8a35924f482ff41b1418c9ab13979fd1c99.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/glusterfs/glusterfs-11.0.ebuild X-VCS-Directories: sys-cluster/glusterfs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 03b9c8a35924f482ff41b1418c9ab13979fd1c99 X-VCS-Branch: master Date: Mon, 31 Jul 2023 12:04:37 +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: 4c449150-17c7-41c0-aa90-dd60664e8cb5 X-Archives-Hash: ef377961be0d50b78c0f9a676eb022f8 commit: 03b9c8a35924f482ff41b1418c9ab13979fd1c99 Author: Sam James gentoo org> AuthorDate: Mon Jul 31 12:04:07 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jul 31 12:04:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03b9c8a3 sys-cluster/glusterfs: fix bash-completion installation w/o bash-completion installed Closes: https://bugs.gentoo.org/911523 Signed-off-by: Sam James gentoo.org> sys-cluster/glusterfs/glusterfs-11.0.ebuild | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys-cluster/glusterfs/glusterfs-11.0.ebuild b/sys-cluster/glusterfs/glusterfs-11.0.ebuild index 272ca69c012c..eb29d14d963a 100644 --- a/sys-cluster/glusterfs/glusterfs-11.0.ebuild +++ b/sys-cluster/glusterfs/glusterfs-11.0.ebuild @@ -126,7 +126,13 @@ src_install() { local bashcompdir=$(get_bashcompdir) bashcompdir="${bashcompdir}" default - mv "${ED}/${bashcompdir}/gluster.bash" "${ED}/${bashcompdir}/gluster" || die + # XXX: Quick hack to fix bug #911523 + if [[ -f "${ED}"/${bashcompdir}/gluster.bash ]] ; then + mv "${ED}/${bashcompdir}/gluster.bash" "${ED}/${bashcompdir}/gluster" || die + else + newbashcomp "${ED}"/etc/bash_completion.d/gluster.bash ${PN} + rm -rf "${ED}"/etc/bash_completion.d || die + fi rm \ "${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \