From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-915985-garchives=archives.gentoo.org@lists.gentoo.org>
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 471B51395E2
for <garchives@archives.gentoo.org>; Thu, 8 Dec 2016 09:39:20 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 82C5CE0C0F;
Thu, 8 Dec 2016 09:39:19 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5C6E8E0C0F
for <gentoo-commits@lists.gentoo.org>; Thu, 8 Dec 2016 09:39:19 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 76A613412C1
for <gentoo-commits@lists.gentoo.org>; Thu, 8 Dec 2016 09:39:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FB2C495
for <gentoo-commits@lists.gentoo.org>; Thu, 8 Dec 2016 09:39:17 +0000 (UTC)
From: "Yixun Lan" <dlan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" <dlan@gentoo.org>
Message-ID: <1481189955.0e5dbcae4e52d5c1e4ec2b23707b569f397fa311.dlan@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/lxc/lxc-2.0.6-r1.ebuild app-emulation/lxc/lxc-2.0.6.ebuild
X-VCS-Directories: app-emulation/lxc/
X-VCS-Committer: dlan
X-VCS-Committer-Name: Yixun Lan
X-VCS-Revision: 0e5dbcae4e52d5c1e4ec2b23707b569f397fa311
X-VCS-Branch: master
Date: Thu, 8 Dec 2016 09:39:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 6cd49e68-81b3-410e-b4ca-5f176ab66ac9
X-Archives-Hash: 4b914c581176d3682690dae80ecec8a3
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