We do not want to return from start() function without eend. Fixed with additional variable . Also fixed bug #103433

Package-Manager: portage-1.589-cvs

3 files changed, 33 insertions, 41 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index f895a541a460..9d20f3890006 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.95 2005/09/16 23:36:36 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.96 2005/09/18 13:12:59 mkay Exp $
+
+  18 Sep 2005; <mkay@gentoo.org> files/mldonkey.initd:
+  Fixed init script. Thanks M. Giritli <giritli@sonne.uni-freiburg.de> for bug
+  #103433
 
   16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index adf9592d781b..ee34164061a1 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,41 +1,31 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5e2cc55c3eb55fe36b6edd16b591422d mldonkey-2.5.28-r4.ebuild 2801
-MD5 d86dfd01c3198c8417bba164e15b70b2 mldonkey-2.6.4-r1.ebuild 4889
+MD5 80e9ae5ee5d4751da2a2f37d3b84ac41 ChangeLog 16000
+MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242
+MD5 29c93beb8a325548b6d81f1c5b311385 mldonkey-2.5.16-r10.ebuild 2691
+MD5 a92ec1a9e1c381c49b544c81221a8bd0 mldonkey-2.5.16-r9.ebuild 2660
+MD5 e4d631474942d4a724d5be73a39df379 mldonkey-2.5.21-r2.ebuild 2692
 MD5 e898f4bf79d82a45616f500872d06576 mldonkey-2.5.27-r1.ebuild 2756
+MD5 5e2cc55c3eb55fe36b6edd16b591422d mldonkey-2.5.28-r4.ebuild 2801
 MD5 0eb263f37a1d27990436054b98ed0f99 mldonkey-2.6.0.ebuild 3563
-MD5 2b1f398a597b4bf15e6ca18c1b44c71e mldonkey-2.6.3.ebuild 5353
-MD5 29c93beb8a325548b6d81f1c5b311385 mldonkey-2.5.16-r10.ebuild 2691
 MD5 bce4aa2fc8121578b5f6db881bdf40d4 mldonkey-2.6.2.ebuild 5353
-MD5 e4d631474942d4a724d5be73a39df379 mldonkey-2.5.21-r2.ebuild 2692
-MD5 a92ec1a9e1c381c49b544c81221a8bd0 mldonkey-2.5.16-r9.ebuild 2660
+MD5 2b1f398a597b4bf15e6ca18c1b44c71e mldonkey-2.6.3.ebuild 5353
 MD5 74a55747fa90506b29bd488c3c4c4cc0 mldonkey-2.6.4.ebuild 5263
-MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242
-MD5 8df24acab3f92772c45961544ea293c0 ChangeLog 15858
-MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
-MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336
+MD5 d86dfd01c3198c8417bba164e15b70b2 mldonkey-2.6.4-r1.ebuild 4889
+MD5 a929dcdb98bcc52d06066afb45960ea9 files/2.5.28-config.patch 586
+MD5 0df6a96e1107b6967473bbfdf5f4c9d6 files/digest-mldonkey-2.5.16-r10 128
+MD5 b1c7f6fe232921bb9516c1007f34efd4 files/digest-mldonkey-2.5.16-r9 128
+MD5 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
+MD5 6df804eab9a1d919e43d09f42c700b40 files/digest-mldonkey-2.5.27-r1 129
+MD5 4083205e52db56c9d64c4a67db61cbf2 files/digest-mldonkey-2.5.28-r4 129
+MD5 2db375201ae817eaa7075507d9700eed files/digest-mldonkey-2.6.0 68
 MD5 67a885de61cad79c8770c9c6c136648b files/digest-mldonkey-2.6.2 204
-MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.21-configure.patch 540
+MD5 ba011b39cf2f1b424360ca9a38089064 files/digest-mldonkey-2.6.3 204
 MD5 9613def727af8826277e993290216c36 files/digest-mldonkey-2.6.4 144
+MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336
+MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
+MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.21-configure.patch 540
+MD5 05622542c4f7a93553ab90d66f871b2d files/mldonkey-2.6.0-gtk2-gentoo.patch 497
 MD5 93e16748ad44af182177978057266aa7 files/mldonkey-gui.desktop 263
-MD5 0df6a96e1107b6967473bbfdf5f4c9d6 files/digest-mldonkey-2.5.16-r10 128
-MD5 a929dcdb98bcc52d06066afb45960ea9 files/2.5.28-config.patch 586
-MD5 855aedd7fba1ffe74d7f6c0bce98f45f files/mldonkey.png 6835
 MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
-MD5 05622542c4f7a93553ab90d66f871b2d files/mldonkey-2.6.0-gtk2-gentoo.patch 497
-MD5 2db375201ae817eaa7075507d9700eed files/digest-mldonkey-2.6.0 68
-MD5 ba011b39cf2f1b424360ca9a38089064 files/digest-mldonkey-2.6.3 204
+MD5 51820a1f1d6520039308f7a329403435 files/mldonkey.initd 3019
+MD5 855aedd7fba1ffe74d7f6c0bce98f45f files/mldonkey.png 6835
 MD5 9613def727af8826277e993290216c36 files/digest-mldonkey-2.6.4-r1 144
-MD5 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
-MD5 b1c7f6fe232921bb9516c1007f34efd4 files/digest-mldonkey-2.5.16-r9 128
-MD5 6df804eab9a1d919e43d09f42c700b40 files/digest-mldonkey-2.5.27-r1 129
-MD5 4083205e52db56c9d64c4a67db61cbf2 files/digest-mldonkey-2.5.28-r4 129
-MD5 8eb1c3cd8359a02e5bc736805a940e7f files/mldonkey.initd 2996
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDK1c3LLFUmVNQ7rkRAuO0AJ9aOOeyVn+7PIZd23+nj83ce5lBgQCeLmK7
-OpxEswVj4T1G3ayIKbM4Sds=
-=DprP
------END PGP SIGNATURE-----
diff --git a/net-p2p/mldonkey/files/mldonkey.initd b/net-p2p/mldonkey/files/mldonkey.initd
index 5179a7b795df..b86a7360f10f 100644
--- a/net-p2p/mldonkey/files/mldonkey.initd
+++ b/net-p2p/mldonkey/files/mldonkey.initd
@@ -7,6 +7,7 @@ depend() {
 }
 
 start() {
+	result=0
 	ebegin "Starting mldonkey"
 	if [ ! -d ${BASEDIR}/${SUBDIR} ]
 	then
@@ -18,30 +19,27 @@ start() {
 			if [ ! -d ${BASEDIR} ]
                 	then
                         	eerror "Directory ${BASEDIR} could not be created!"
-                        	return 1
+                        	result=$(( ${result} + 1 ))
 			fi
                 fi
 		su ${USER} -c "mkdir ${BASEDIR}/${SUBDIR}" 
 		if [ ! -d ${BASEDIR}/${SUBDIR} ]
 		then
 			eerror "Directory ${BASEDIR}/${SUBDIR} could not be created!"
-			return 1
+			result=$(( ${result} + 1 ))
 		fi
 		einfo "...ok!"
 	fi
 	cd ${BASEDIR}/${SUBDIR}/
 	env HOME=${BASEDIR} start-stop-daemon --quiet --start -c ${USER}  \
-		-x /usr/bin/mlnet &>${LOG} &
+		--nicelevel ${NICE} -x /usr/bin/mlnet &>${LOG} &
 	sleep 5
 	if ! pgrep -u ${USER} mlnet >/dev/null
 	then
 		eerror "MLDonkey could not be started! Check logfile: ${LOG}"
+		result=$(( ${result} + 1 ))
 	fi
-	for i in `pgrep -u ${USER} mlnet`
-	do
-		renice ${NICE} -p $i > /dev/null
-	done
-	eend $?
+	eend $result
 }
 
 stop() {