[gentoo-commits] eselect r692 - in trunk: . bin

[gentoo-commits] eselect r692 - in trunk: . bin

[Ulrich Mueller (ulm)]

Author: ulm
Date: 2009-10-11 10:56:56 +0000 (Sun, 11 Oct 2009)
New Revision: 692

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/bin/eselect.in
Log:
Don't use hyphens in identifiers for function names.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-11 10:23:56 UTC (rev 691)
+++ trunk/ChangeLog	2009-10-11 10:56:56 UTC (rev 692)
@@ -1,5 +1,9 @@
 2009-10-11  Ulrich Mueller  <ulm@gentoo.org>
 
+	* bin/eselect.in (ec_do_list_options, ec_do_list_modules):
+	Renamed from ec_do_list-* to prevent invalid identifier errors in
+	POSIX mode, bug 280191. Substiture underscore for hyphen in call.
+
 	* modules/news.eselect (do_read): Suppress "no news" message in
 	brief output mode, bug 288527.
 

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-10-11 10:23:56 UTC (rev 691)
+++ trunk/NEWS	2009-10-11 10:56:56 UTC (rev 692)
@@ -1,6 +1,10 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+trunk:
+    Bug fixes:
+    - Fixed bug #280191: Don't use hyphens in identifiers.
+
 1.2.4:
     Bug fixes:
     - Fixed bug #287730: Relative filename for symlink in profile module.

Modified: trunk/bin/eselect.in
===================================================================
--- trunk/bin/eselect.in	2009-10-11 10:23:56 UTC (rev 691)
+++ trunk/bin/eselect.in	2009-10-11 10:56:56 UTC (rev 692)
@@ -108,17 +108,17 @@
 	echo "Distributed under the terms of the GNU General Public License v2."
 }
 
-# ec_do_list-options
+# ec_do_list_options
 # Display all recognized global options
-ec_do_list-options() {
+ec_do_list_options() {
 	write_list_start "Global options:"
 	#write_kv_list_entry "--brief"    "Make output shorter (experimental)"
 	write_kv_list_entry "--no-color,--no-colour"    "Disable coloured output"
 }
 
-# ec_do_list-modules
+# ec_do_list_modules
 # Display all available eselect modules DEPRECATED
-ec_do_list-modules() {
+ec_do_list_modules() {
 	do_action modules list "$@"
 }
 
@@ -184,9 +184,9 @@
 fi
 
 if [[ -n ${action} ]] ; then
-	if is_function "ec_do_${action}" ; then
+	if is_function "ec_do_${action//-/_}" ; then
 		[[ $# -gt 0 ]] && die -q "Too many parameters"
-		ec_do_${action}
+		ec_do_${action//-/_}
 	else
 		do_action "${action}" "$@"
 	fi