glance's init script now works (among other things in bug 475462)

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

4 files changed, 22 insertions, 8 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index cb1bbcff01f2..f479fd82d045 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/glance
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.11 2013/06/30 23:46:58 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.12 2013/07/02 15:33:35 prometheanfire Exp $
+
+*glance-2012.2.4-r3 (02 Jul 2013)
+*glance-2013.1.2-r3 (02 Jul 2013)
+
+  02 Jul 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +glance-2012.2.4-r3.ebuild, +glance-2013.1.2-r3.ebuild,
+  -glance-2012.2.4-r2.ebuild, -glance-2013.1.2-r2.ebuild, files/glance.initd:
+  glance's init script now works (among other things in bug 475462)
 
 *glance-2013.1.2-r2 (30 Jun 2013)
 *glance-2012.2.4-r2 (30 Jun 2013)
diff --git a/app-admin/glance/files/glance.initd b/app-admin/glance/files/glance.initd
index 342c0d6cfec9..f02a36b7cac5 100644
--- a/app-admin/glance/files/glance.initd
+++ b/app-admin/glance/files/glance.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/files/glance.initd,v 1.1 2013/01/20 06:39:20 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/files/glance.initd,v 1.2 2013/07/02 15:33:34 prometheanfire Exp $
 
 depend() {
 	need net
@@ -30,7 +30,7 @@ start() {
 	ebegin "Starting ${SVCNAME}"
 	
 	start-stop-daemon --start --quiet --pidfile "${PID_PATH}/${SVCENAME}.pid" \
-					  --exec /usr/bin/glance-control -- ${SERVERNAME} start
+					  --exec /usr/bin/glance-control ${SERVERNAME} start /etc/glance/glance-${SERVERNAME}.conf
 	
 	eend $? "Failed to start ${SVCNAME}"
 }
@@ -42,7 +42,7 @@ stop() {
 	ebegin "Stopping ${SVCNAME}"
 	
 	start-stop-daemon --stop --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-					  --exec /usr/bin/glance-control -- ${SERVERNAME} stop
+					  --exec /usr/bin/glance-control ${SERVERNAME} stop /etc/glance/glance-${SERVERNAME}.conf
 	eend $? "Failed to stop ${SVCNAME}"
 }
 
diff --git a/app-admin/glance/glance-2012.2.4-r2.ebuild b/app-admin/glance/glance-2012.2.4-r3.ebuild
index 51a6bc0470da..04e06a0b86ad 100644
--- a/app-admin/glance/glance-2012.2.4-r2.ebuild
+++ b/app-admin/glance/glance-2012.2.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2012.2.4-r2.ebuild,v 1.1 2013/06/30 23:46:58 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2012.2.4-r3.ebuild,v 1.1 2013/07/02 15:33:35 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -61,11 +61,14 @@ python_install() {
 	done
 
 	diropts -m 0750
-	dodir /var/run/glance /var/log/nova /var/lock/nova
+	dodir /var/run/glance /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
 	#removed because it conflicts with glanceclient, which we install in rdepend
 	rm ${D}"/usr/bin/glance" ${D}"/usr/bin/glance-python2.7"
 
 	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
 	insinto /etc/glance
 
 	doins "etc/glance-api-paste.ini"
diff --git a/app-admin/glance/glance-2013.1.2-r2.ebuild b/app-admin/glance/glance-2013.1.2-r3.ebuild
index 6ba5f00ec8d2..4fbe9399cbbe 100644
--- a/app-admin/glance/glance-2013.1.2-r2.ebuild
+++ b/app-admin/glance/glance-2013.1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.2-r2.ebuild,v 1.1 2013/06/30 23:46:58 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.2-r3.ebuild,v 1.1 2013/07/02 15:33:35 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -67,8 +67,11 @@ python_install() {
 	done
 
 	diropts -m 0750
-	dodir /var/run/glance /var/log/nova /var/lock/nova
+	dodir /var/run/glance /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
 	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
 	insinto /etc/glance
 
 	doins "etc/glance-api-paste.ini"