aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS4
-rwxr-xr-xbin/eselect.in12
3 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f0a5358..9f0e01c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/NEWS b/NEWS
index 6ccd776..61d5300 100644
--- a/NEWS
+++ b/NEWS
@@ -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.
diff --git a/bin/eselect.in b/bin/eselect.in
index c28123a..c9d84a3 100755
--- a/bin/eselect.in
+++ b/bin/eselect.in
@@ -108,17 +108,17 @@ ec_do_version() {
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 @@ if [[ -z ${action} ]] && [[ -n ${1##--} ]] ; then
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