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

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

5 files changed, 39 insertions, 25 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/Manifest b/app-admin/glance/Manifest
index 50143b9bc8a0..b428324f381a 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -4,28 +4,28 @@ Hash: SHA256
 AUX glance-gbug-474064-folsom.patch 2357 SHA256 1a8cd2bc81de9d8149590b0f11a30d13928740ac1548ab4a5e934a311f1b0d18 SHA512 7a2005899c88cd29ef1be1b3c6119767ad2ba62b878438cb4aabecea677579c65c654526ba9afac8c73016d6b8085a6fad0016167d06437087abfc8e0ab26bda WHIRLPOOL 497a415c7c1d09075ca0e809f7dc75b2a4147bcdf53e6ccb64e439d507972dfd7336e69f980f9673ce59e1047adb5497351386bdeceaec53022a79a417c129bd
 AUX glance-gbug-474064-grizzly.patch 2377 SHA256 df92ba14455d4379f0c2297f1f087d7f3f08118e6129e45b0e5bf5fd26c7aba1 SHA512 a284b6002c3b4ae39678eb0c492b3adb6311b115761ef43f38427dc08670c0ebfb4011a3879291ee6acdf9480ca135b4cff77f41b7af9fe7a837effafba2c6f0 WHIRLPOOL 8adfcc80adf72b501a7123c29454c446b86c05917cc8a910f799db5c223fc0efb02240f36b842c05c08e8347ae6d6273ddfa088a03f0f65eee0cbfc40176c9c2
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
-AUX glance.initd 1206 SHA256 23c091ad32832b9a522518676427a2f98bc7dfa826c0bb67a0f9befaa615cafe SHA512 cd0a13ee2a7134cb2917cf2d5579f63c88a6d04769a1370ef5bdc1cfd8ebe7ad2986c501b976ae9752688c177c7a71457bae79cd3e89f84dbf9d5ac259f4099a WHIRLPOOL e59dd3a7a11b3bd74abfbc5e29bc84ce4ff3381ae411359d0d097e3123487d2eded8aefbc54f0a7feae06ecea0861e16a1cb0bd7fcb467a7c714e9c65afb7dd1
+AUX glance.initd 1276 SHA256 030c10e8688916024eef7222d9f801f2fad2204c160ebc5898e3f764bc96c353 SHA512 4514ce8df0b96e1dbd51df4c55d79cf55122957199488dcfcdf8699de3f919b58e81609cc129203d62c2fd706865463ad480ac3cb50bd151471594171532cdb0 WHIRLPOOL f82ba96f3429c937e9404e0f4ceb643b05c32d127757eeabd5f0d0790eef91a62a11978a237cc0fa1abfd2246b811a9d61e03247ffb6320ae145d7ab9a2515b8
 DIST glance-2012.2.4.tar.gz 643408 SHA256 d50fa522e890258eff32aad1947684abdf0cf0c67a8a487f60a7179a84edd3f2 SHA512 fc91d799fa5fd2c66aef228d622c852623e70fa83e5babdeb10e041f77571e5a08c90c6fca16943dc98ca1cd50a09314fc5bd282e5530e7e1e44a623eee28198 WHIRLPOOL 34fdfab54444845ed4a3c0e849066f01ef88cf4317d952a0fedf562f331a41c87572d80234296651a722770929472de9263f7ded37deaaf6d65f35723e41031c
 DIST glance-2013.1.2.tar.gz 719039 SHA256 55d12a314f6fa5d291c0a0f9be4ad9d2b53086a9e47fad82d83bcf08105a65a0 SHA512 124d8d133bdbdab5b1bf43d7faa3249b14d91fed2edcc0621619865ad0fe22021d98d37786d8866a97e6b4613968b82985f7778be37f0e7f71e5e56299a1f680 WHIRLPOOL d57b5b213a25155436a941a2c44144dce31be7d23a168765fb59f8956148460d0e8c7b3052362f03f0acc9ee520b73d5a3e0ac9dec9a410318942501a6beccb6
-EBUILD glance-2012.2.4-r2.ebuild 2564 SHA256 8d99d82f913fa8e5f99df4e7b157e49f93e41746a3a35d2dddfcd8b43c6d842c SHA512 f55cec79be5366f113428a84c414fe89c7a694a77a9f405bace6a2d5a4f6fd2995d992f671c6b8e097d9fa93e88bfddc87bf9a6ecb02c61d875f372c4812a78f WHIRLPOOL 72b0b8f4001cc4a8f160fd843086591d3ef0b1c365af27958c4b192655b96b758e0926dd649bda023121c8b83cf42922b03b874bb5f8dbf21aa7d9fedefa4200
-EBUILD glance-2013.1.2-r2.ebuild 2735 SHA256 5a1d06b4c32c00e2a5a8f3e6fa42b390fb3f7388c5711660b404f504e44b69c5 SHA512 74c7b4e4d5d800065f67b32f42124e174d648417abbdd05960d5ff3b6a97c7fd43bc1afe9f249eb28ede34acf69e4bae2795dd56b77402ceb699372457515d5e WHIRLPOOL 7fc308552cae17f064ca647257481f4d3336879dba56a61aa1429d6a83e7c392e2eccbde7af0700f62b83762c6342e287ae23946a9fd9d48c2f0550d87cc47c8
+EBUILD glance-2012.2.4-r3.ebuild 2690 SHA256 7ff1fbab494058436d41f56392ea32a9a701f77f61919247c2e08275d58e291f SHA512 6180bb2adbb5305f77caecead3771d32fc201e81635e694caac4162f835cae1125c2dda7829d2268af54e7bf64cb57f447e82e33c07bb46cb054801301324905 WHIRLPOOL 080efcb922f5ee8b58c80aa1ada75ff9ef085828c0b8c9a1280c52f6f6d5cf3d6167bb14bd198edabef9beee971885dd06d1cc9588e52921278b90d36e9863bd
+EBUILD glance-2013.1.2-r3.ebuild 2861 SHA256 ef0446a84b2ccad2b1d404ec9b55dbf25fe754b20ce13f0e1505937b77f089cb SHA512 09036dc264047239d922bf3f3a2bf24d069c3ddd07b681e3367aa8326bae5c343c36d26df9bd35e16254eae4539246dd451c87e868477af8af2e1ea48f26a1a8 WHIRLPOOL 91ad565e35f2958a16a7110d1d5baa56f46c010fd2aad56c4e8599bb40fa2dfc9b6ac67e32c16a8db90e550db51c51d5ba502ea97dce9c4c0a6048f3d5e6f033
 EBUILD glance-9999.ebuild 2407 SHA256 554e8efefd7ef9b86422810a054d38a275ed88a41875a6a20725e157d5dd9e32 SHA512 221eaff137650344f7077496cce86e9fc8fe803bdd35a3902ea77afee41fce7b067c5cae821f92528a6f3047d4cd42a0441030a7dba223adc1fb877cb4549ad0 WHIRLPOOL d27f6c0bd535f8164d47b63b34454b41980413ddc61b3e541fa2c08e68506883c491c6aacf9fd5340d664470fc0e2ea61c7a9d947753ff62d9b1ed3e63599621
-MISC ChangeLog 2602 SHA256 f651893c7039cbdbe9df56674c213afec52c8ac73a6b1b8a12f192bbeea6b7b3 SHA512 f73181930cf31e09dea004add438feeda93cdab93645ae242fbc8de9f78f04437244764868176c0a0a88a58ef70014b481159b13b1c55dd600435620b628ca71 WHIRLPOOL 08f1ee86c4d571877844f679228e95b33a10470975c529471d9158cc6fe383b43b7f30c8c750d1ecaf4bfdab6a137c9f22461ae11ed484f15a047b1e957ef275
+MISC ChangeLog 2933 SHA256 0f0be388768a96cc03a3a3ef3cb02360a16154887193d2247561680828956ad9 SHA512 57b2a695922f88ebc5f9624b3f6897960e7d31538a70fffe897909c661341ce3515f8e1d1bd4b45174cb718eba757c74fe6a8d45262afc93acad68db76af0d51 WHIRLPOOL 32fa1eeaff202f6ca5c3eabd92f1e5fcb0b5a91c87063bbbd1b58d4bc9d83663cb8bbb6890c9c2874494268d1c7c1fed9c3ed8abffc03809d6f20e1845dde2c2
 MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR0MOIAAoJECRx6z5ArFrDIokP/1SzMdNExvzAmB7cIT+mwV/f
-19+NvrD64fEzfohWLDPjX3PCVfpkdEgwvzanjC8uvXehK1qrqbjCnor1kdZTD2cy
-LoBmdRTFVMn1eO2p/g8yyprZiZJfOLnzqNV5+yE7A+Scys8OLe10XpDvDo31QMUW
-L8vyxzmPHrLQC1zxec63ZDX8+Bf04+WJ/kkCrdPZ5fLkdJHLglvua8GNF9wMW7qP
-ojTJ230aWKQt1SO92A18rm8/zeevsiOkoxZyZKo17intxPvpBEqgduUKLGKXA9E9
-wnzBmeepO8Y7+PwxnFRQZ5qMNQJPTNpqzh0+5qPDkAgCiP36oKVi5BmwxGnQlAap
-M2Bzc507xIMyk419uLO4udK/mWKhAZ/ah0G9WFbXA4WVepG61woIaFIksmyGrEL8
-wEXJNVAfhFfahMZ7Ltd0ulcwguXSm/bv+sFHfEV18+vfmzVis/z9f5ho5Z67Fch1
-g0OZRvkwdENR1DmJw8+pAprq+WlIrA/jThYiMhgysAQJkdgzvhDFqCzIXcAdDvDn
-3E/jJpnfoiyW7HsxLEJdDvL/NiQlIzlOOD4GrzRGki9KmaUcbXCKPtusW23eaAId
-7dRjPk4htOisZUmjGGlQmcj9cXc8gLIrROZ+IWcjqVwgXZxQ8s16oWLMnIoJWmD8
-6o299ud7djFA/jeqGFpn
-=bLvJ
+iQIcBAEBCAAGBQJR0vL+AAoJECRx6z5ArFrDDNYP/2yAyl7LHCJIfK/wKI98WmIu
+mbXYk2jO9RkNGi9ik/WqvvlABXCeOPBbOrR/xGrWqd52C35Fvkf4+Ls7CtWCIHQz
+0edgYrujWRIi2bFhoQXQD/0iTkBbXQ7uZdbVSX/mUHqcO/PO65kijww5zt7L1gfv
+1OKpwpp/v7azbHDJ672Xawj7ipYf4wafQYatoXqjOrd/L31wc7Qt7RDFCEYO0I55
+M7kY3yjEgqQQ+QbQIz4XCf+rhCE5pz7s77X6VrDdQtbY5MUQl3yw94/Gd6cHbw3F
+Q+l9eKnaRuzGBzCyPzWsqvbMW4yoLVaoWpl8G5e2e6sbjvZnuV8wIAueqrjFFV5m
+hpnJsruQhoht8rOvESvAWjOgLly0m7e5JmuwjF/4dgopbv3Kvz0c6ZUeHJ8f+wrY
++07WAN03ojXVwCSzC3ReOxo9PzGmnQwE2TKvs5ewyAzdWNnI7koNkCzi96Y2E6Po
+uvC7LT4SvJn47f2oJODvYWbymMprGyhF2eLgLiGMLQdU9tqkUOSRvy3tH9ZXe+ep
+7xz02YjANDbpLHd2h/nxe1ioGBsl5ZZwn1bzjBen2dnxBdKmkcfHrjITyF+AzR6G
+1kenQPc2JdsfMCVmW7Gxp6XYydo/9lEb+LiBA9t0yJPcmQ17dhOfK93iC3e2U5wB
+Pt1zJg0dkDP62dMyE98E
+=it+b
 -----END PGP SIGNATURE-----
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"