summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2012-02-20 15:35:57 +0000
committerDoug Goldstein <cardoe@gentoo.org>2012-02-20 15:35:57 +0000
commit0c061ee0d3334b8c0619ee6d60f93ab9cbf81738 (patch)
treebef9cd61318adb1cdf672d95f1223b200798efd2 /app-emulation
parentRestricting pypy #403783 (diff)
downloadgentoo-2-0c061ee0d3334b8c0619ee6d60f93ab9cbf81738.tar.gz
gentoo-2-0c061ee0d3334b8c0619ee6d60f93ab9cbf81738.tar.bz2
gentoo-2-0c061ee0d3334b8c0619ee6d60f93ab9cbf81738.zip
Fix syntax error in the init script. bug #404525
(Portage version: 2.1.10.46/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/libvirt/ChangeLog9
-rwxr-xr-xapp-emulation/libvirt/files/libvirtd.init-r7 (renamed from app-emulation/libvirt/files/libvirtd.init-r6)2
-rw-r--r--app-emulation/libvirt/libvirt-0.9.10-r2.ebuild (renamed from app-emulation/libvirt/libvirt-0.9.10-r1.ebuild)4
-rw-r--r--app-emulation/libvirt/libvirt-9999.ebuild4
4 files changed, 13 insertions, 6 deletions
diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index ca6f008b10b2..15be8869d8bb 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-emulation/libvirt
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.159 2012/02/20 05:18:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.160 2012/02/20 15:35:56 cardoe Exp $
+
+*libvirt-0.9.10-r2 (20 Feb 2012)
+
+ 20 Feb 2012; Doug Goldstein <cardoe@gentoo.org> -libvirt-0.9.10-r1.ebuild,
+ +libvirt-0.9.10-r2.ebuild, libvirt-9999.ebuild, +files/libvirtd.init-r7,
+ -files/libvirtd.init-r6:
+ Fix syntax error in the init script. bug #404525
19 Feb 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.10-r1.ebuild:
Actually push the use of the backports tarball.
diff --git a/app-emulation/libvirt/files/libvirtd.init-r6 b/app-emulation/libvirt/files/libvirtd.init-r7
index 8eb09e8aae2f..a8ad7c1922e0 100755
--- a/app-emulation/libvirt/files/libvirtd.init-r6
+++ b/app-emulation/libvirt/files/libvirtd.init-r7
@@ -102,7 +102,7 @@ stop() {
einfo " Shutting down network(s):"
for net_name in $(libvirtd_net_list qemu); do
einfo " ${net_name}"
- libvirtd_virsh net-destroy ${net_name} > /dev/null
+ libvirtd_virsh qemu net-destroy ${net_name} > /dev/null
done
if [ "$(libvirtd_net_count qemu)" != "0" ]; then
diff --git a/app-emulation/libvirt/libvirt-0.9.10-r1.ebuild b/app-emulation/libvirt/libvirt-0.9.10-r2.ebuild
index 9d054a62af20..0ff52243ceef 100644
--- a/app-emulation/libvirt/libvirt-0.9.10-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.10-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.10-r1.ebuild,v 1.2 2012/02/20 05:18:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.10-r2.ebuild,v 1.1 2012/02/20 15:35:56 cardoe Exp $
BACKPORTS=1
#AUTOTOOLIZE=yes
@@ -213,7 +213,7 @@ src_install() {
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
- newinitd "${FILESDIR}/libvirtd.init-r6" libvirtd || die
+ newinitd "${FILESDIR}/libvirtd.init-r7" libvirtd || die
newconfd "${FILESDIR}/libvirtd.confd-r3" libvirtd || die
keepdir /var/lib/libvirt/images
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index ea3f038f15f4..c2962791bacd 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.20 2012/02/15 22:45:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.21 2012/02/20 15:35:56 cardoe Exp $
#BACKPORTS=2
#AUTOTOOLIZE=yes
@@ -213,7 +213,7 @@ src_install() {
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
- newinitd "${FILESDIR}/libvirtd.init-r6" libvirtd || die
+ newinitd "${FILESDIR}/libvirtd.init-r7" libvirtd || die
newconfd "${FILESDIR}/libvirtd.confd-r3" libvirtd || die
keepdir /var/lib/libvirt/images