fix init script, revbump

4 files changed, 33 insertions, 35 deletions

diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
index affc904ffe79..be81c0e9cca5 100644
--- a/dev-util/schroot/ChangeLog
+++ b/dev-util/schroot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/schroot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.7 2009/11/12 02:06:50 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.8 2009/11/18 09:56:05 abcd Exp $
+
+*schroot-1.2.3-r4 (18 Nov 2009)
+
+  18 Nov 2009; Jonathan Callen <abcd@gentoo.org> -schroot-1.2.3-r3.ebuild,
+  +schroot-1.2.3-r4.ebuild, files/schroot.initd:
+  Fix init script to actually end sessions when requested instead of recover
+  them (copy & paste error)
 
 *schroot-1.2.3-r3 (12 Nov 2009)
 
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index ea7eddc03a4c..34a946145642 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,8 +1,8 @@
 AUX schroot-1.2.3-autotools.patch 4432 RMD160 1ecd6ff54c4a24ff311ed44fbecd231b0aa3c8bf SHA1 931533d5451c974fc961b5d57c06d082bb46e9d2 SHA256 5aa0984dd93441c28ba790d7dcad762f77ebc35ea05238f47ad73adc9de79c19
 AUX schroot-1.2.3-tests.patch 3731 RMD160 0cb5ccf9f4cc526c7c80fe2fc3b0faa2d3e2ddbb SHA1 78d28c87f42f292434c2ec99029c98ec4ad26b26 SHA256 901c9d33b492c7a6d3cd75cebcc898985bf32563a5dde6fdafcd8df7168200e6
 AUX schroot.confd 371 RMD160 d7efa36975f549304a1e8a942f6389720d1bff88 SHA1 3eaf672a13c6dd4fadd01b7c1c54bc82f71d5b93 SHA256 68efa89cd4b358c6de050ebb5b973c87ee514fe5e5d888f63aa0af85aa4736c8
-AUX schroot.initd 844 RMD160 11eca8fd477b215d5b4964b582573ce14f116d25 SHA1 fe687d49e7d80342d46767f5e5fe63eed94a805d SHA256 f0f44c9fed06438f72f58825f67316c5069d58a6dfe3e1a33d0092b4fac1fb9f
+AUX schroot.initd 705 RMD160 efdb102d21137a72b20fef8882e2b15ba7dabfc6 SHA1 d585fba4d92dc6d94275e079046e4ce821183b6b SHA256 8f8537c0c6c93d1169c8a333ddd78c4471d95956cfb187e3bd6612a4ad9f78f5
 DIST schroot_1.2.3.orig.tar.gz 25486414 RMD160 2c8c4bb92c870a6c0514df528d13f73b8f1b6d05 SHA1 1775aa19e3cb3237d8aa3cc36e3382d7e2c2919b SHA256 c3bca449abdf28b66f6aede8892ce61967b5c1d758ba567e8648ccfb0cf914ec
-EBUILD schroot-1.2.3-r3.ebuild 2153 RMD160 9576e70eb124c06829cdd70978162f3150bfb890 SHA1 d100763eeb73290b5f19fab55da6712a22b91fca SHA256 74a7fd1382763a8c9238ee0e6e60e86938d41fe67c465fb59d32128ca7e66b79
-MISC ChangeLog 1581 RMD160 0ef7dcc98e34a4db019d08dcc4b3968e6a55fc5d SHA1 ad39a9b29c8adf6157973b0aa6dfc749d8338954 SHA256 214111677aca94cc61961cfab390a237a6c4c1c172e4353adc73e5a4700bae46
+EBUILD schroot-1.2.3-r4.ebuild 2153 RMD160 91c59ee84777aec798bbdba1c736eb5861309ac6 SHA1 2e2d1e56bb4cc5f9c9189c7af3fbcfe2fcb226cf SHA256 8bfa2ce152781eb3f7360ea8de4b5d264a908f503211baef032e2e0a908eea9b
+MISC ChangeLog 1844 RMD160 4aa98c1e94b138ebe753ca68f9e038b719342fc0 SHA1 b8c44383b4a368b0ae77e474841764b8f92712cc SHA256 1bf17e10c189bdf33f0e7bf84dcad9fe6b1bf901f0da6c6bced834603eeda863
 MISC metadata.xml 384 RMD160 083cf5152883690484a973130318aef0d2c4f349 SHA1 d464ac6af08d92976517ae5715e1936c408c168d SHA256 58018798cc44ed856afd8c3c0e957aae8aabf548cc716e675604acc456fc20ef
diff --git a/dev-util/schroot/files/schroot.initd b/dev-util/schroot/files/schroot.initd
index a9a15e2349fb..76ca9944532d 100644
--- a/dev-util/schroot/files/schroot.initd
+++ b/dev-util/schroot/files/schroot.initd
@@ -5,33 +5,32 @@ depend() {
 	after net netmount
 }
 
-recover_sessions() {
-	einfo "Recovering schroot sessions"
-	eindent
-	local chroot
-	local chroots="$(schroot --all-sessions --list --quiet)"
-	if [ -n "${chroots}" ]; then
-		for chroot in ${chroots}; do
-			ebegin "$chroot"
-			schroot --chroot=$chroot --recover-session
-			eend $?
-		done
-	else
-		einfo "(none)"
-	fi
-	eoutdent
-	einfo "...done"
-}
+start() {
+	local msg param
+	case "${SESSIONS_RECOVER}" in
+		end)
+			msg="Ending"
+			param="--end-session"
+			;;
+		recover|"")
+			msg="Recovering"
+			param="--recover-session"
+			;;
+		*)
+			ewarn "Invalid value \"$SESSIONS_RECOVER\" for \$SESSIONS_RECOVER, using \"recover\""
+			msg="Recovering"
+			param="--recover-session"
+			;;
+	esac
 
-end_sessions() {
-	einfo "Ending schroot sessions"
+	einfo "$msg schroot sessions"
 	eindent
 	local chroot
 	local chroots="$(schroot --all-sessions --list --quiet)"
-	if [ -n "${chroots}" ]; then
-		for chroot in ${chroots}; do
+	if [ -n "$chroots" ]; then
+		for chroot in $chroots; do
 			ebegin "$chroot"
-			schroot --chroot=$chroot --recover-session
+			schroot --chroot=$chroot $param
 			eend $?
 		done
 	else
@@ -40,11 +39,3 @@ end_sessions() {
 	eoutdent
 	einfo "...done"
 }
-
-start() {
-	if [ "${SESSIONS_RECOVER}" = "end" ]; then
-		end_sessions
-	else
-		recover_sessions
-	fi
-}
diff --git a/dev-util/schroot/schroot-1.2.3-r3.ebuild b/dev-util/schroot/schroot-1.2.3-r4.ebuild
index 0272d4aedcc6..03b7bf502d43 100644
--- a/dev-util/schroot/schroot-1.2.3-r3.ebuild
+++ b/dev-util/schroot/schroot-1.2.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.2.3-r3.ebuild,v 1.1 2009/11/12 02:06:50 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.2.3-r4.ebuild,v 1.1 2009/11/18 09:56:05 abcd Exp $
 
 EAPI="2"