summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2014-11-09 15:28:25 +0000
committerJustin Lecher <jlec@gentoo.org>2014-11-09 15:28:25 +0000
commit93d94f21d46b90335a7eb9206491eb86f0bde1e1 (patch)
tree1c056e1a303e411b410615464896bcd8b4eeef28 /app-emulation
parentUse python 3.4 rather than dead 3.2 in python-r1 examples (diff)
downloadgentoo-2-93d94f21d46b90335a7eb9206491eb86f0bde1e1.tar.gz
gentoo-2-93d94f21d46b90335a7eb9206491eb86f0bde1e1.tar.bz2
gentoo-2-93d94f21d46b90335a7eb9206491eb86f0bde1e1.zip
app-emulation/lxc: Fix for old bash-completion, #527520
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/lxc/ChangeLog5
-rw-r--r--app-emulation/lxc/lxc-1.0.6-r1.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index 8b6ef51f6677..30105f9b983d 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/lxc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.52 2014/10/30 08:50:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.53 2014/11/09 15:28:25 jlec Exp $
+
+ 09 Nov 2014; Justin Lecher <jlec@gentoo.org> lxc-1.0.6-r1.ebuild:
+ Fix for old bash-completion, #527520
*lxc-1.0.6-r1 (30 Oct 2014)
diff --git a/app-emulation/lxc/lxc-1.0.6-r1.ebuild b/app-emulation/lxc/lxc-1.0.6-r1.ebuild
index bfbb3283c474..c30a0e831a71 100644
--- a/app-emulation/lxc/lxc-1.0.6-r1.ebuild
+++ b/app-emulation/lxc/lxc-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.0.6-r1.ebuild,v 1.1 2014/10/30 08:50:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-1.0.6-r1.ebuild,v 1.2 2014/11/09 15:28:25 jlec Exp $
EAPI="5"
@@ -128,7 +128,7 @@ src_compile() {
src_install() {
default
- mv "${ED}"/$(get_bashcompdir)/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+ mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
bashcomp_alias ${PN}-start \
${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
@@ -153,7 +153,7 @@ src_install() {
doexe config/init/systemd/${PN}-devsetup
# Use that script with the systemd service (Similar to upstream
# Makefile.am
- cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service
+ cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service || die
sed -i \
"/Restart=always/a ExecStartPre=/usr/libexec/${PN}/${PN}-devsetup" \
${PN}_at.service \