[gentoo-commits] gentoolkit r735 - in trunk/gentoolkit: . bin

[Christian Ruppert (idl0r)]

Author: idl0r
Date: 2010-01-31 11:48:05 +0000 (Sun, 31 Jan 2010)
New Revision: 735

Modified:
   trunk/gentoolkit/ChangeLog
   trunk/gentoolkit/bin/revdep-rebuild
Log:
Check for eerror in die() since an invalid option(long) or
missing arg will end up in calling die() before /etc/init.d/functions.sh
has been sourced.


Modified: trunk/gentoolkit/ChangeLog
===================================================================
--- trunk/gentoolkit/ChangeLog	2010-01-11 16:36:38 UTC (rev 734)
+++ trunk/gentoolkit/ChangeLog	2010-01-31 11:48:05 UTC (rev 735)
@@ -1,3 +1,8 @@
[phone]: Christian Ruppert <idl0r@g.o>
+	* revdep-rebuild: Check for eerror in die() since an invalid option(long) or
+	missing arg will end up in calling die() before /etc/init.d/functions.sh
+	has been sourced.
+
 2009-01-11: Paul Varner <fuzzyray@g.o>
 	* revdep-rebuild: Set environment using 'portageq -v' (Bug 300229)
 

Modified: trunk/gentoolkit/bin/revdep-rebuild
===================================================================
--- trunk/gentoolkit/bin/revdep-rebuild	2010-01-11 16:36:38 UTC (rev 734)
+++ trunk/gentoolkit/bin/revdep-rebuild	2010-01-31 11:48:05 UTC (rev 735)
@@ -241,7 +241,17 @@
 die() {
 	local status=$1
 	shift
-	eerror "$@"
+
+	# Check if eerror has been loaded.
+	# Its loaded _after_ opt parsing but not before due to RC_NOCOLOR.
+	type eerror &> /dev/null
+
+	if [[ $? -eq 0 ]];
+	then
+		eerror "$@"
+	else
+		echo " * ${@}" >> /dev/stderr
+	fi
 	exit $status
 }
 ##