commit:     0e5dbcae4e52d5c1e4ec2b23707b569f397fa311
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  8 09:37:13 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 09:39:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e5dbcae

app-emulation/lxc: fix bashcomp collision with app-emulation/lxd

Gentoo-Bug: 601602

Package-Manager: portage-2.3.3

 app-emulation/lxc/{lxc-2.0.6.ebuild => lxc-2.0.6-r1.ebuild} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-emulation/lxc/lxc-2.0.6.ebuild 
b/app-emulation/lxc/lxc-2.0.6-r1.ebuild
similarity index 95%
rename from app-emulation/lxc/lxc-2.0.6.ebuild
rename to app-emulation/lxc/lxc-2.0.6-r1.ebuild
index 11e2839..b6928bc 100644
--- a/app-emulation/lxc/lxc-2.0.6.ebuild
+++ b/app-emulation/lxc/lxc-2.0.6-r1.ebuild
@@ -158,10 +158,11 @@ src_compile() {
 src_install() {
        default
 
+       mv "${ED}"/usr/share/bash-completion/completions/${PN} 
"${ED}"/$(get_bashcompdir)/${PN}-start || die
        # start-ephemeral is no longer a command but removing it here
        # generates QA warnings (still in upstream completion script)
-       bashcomp_alias ${PN} \
-               
${PN}-{start,attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
+       bashcomp_alias ${PN}-start \
+               
${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
 
        if use python; then
                pushd "${S}/src/python-lxc" > /dev/null

Reply via email to