[oe-commits] Cristian Iorga : lsb: fix lsb_log_msg() implementation
git at git.openembedded.org
git at git.openembedded.org
Thu Mar 27 09:36:08 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 365ab9118b6c68aedb2e79129202b385329a8abb
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=365ab9118b6c68aedb2e79129202b385329a8abb
Author: Cristian Iorga <cristian.iorga at intel.com>
Date: Thu Mar 27 09:18:17 2014 +0200
lsb: fix lsb_log_msg() implementation
LSB lsb_log_message calls a begin()
function that should be implemented
in /etc/init.d/functions.
The aforementioned script does not
implement the begin() function, as
such there is a small issue related to logging.
This fix implements a local version of
the function, while cleaning up the
troublesome previous implementation.
Fix [YOCTO #5795]
Signed-off-by: Cristian Iorga <cristian.iorga at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-extended/lsb/lsb/init-functions | 7 ++++++-
meta/recipes-extended/lsb/lsb/lsb_log_message | 5 -----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-extended/lsb/lsb/init-functions b/meta/recipes-extended/lsb/lsb/init-functions
index e15827a..7c1dce2 100755
--- a/meta/recipes-extended/lsb/lsb/init-functions
+++ b/meta/recipes-extended/lsb/lsb/init-functions
@@ -30,10 +30,15 @@ log_warning_msg () {
/etc/core-lsb/lsb_log_message warning "$@"
}
+# int log_begin_message (char *message)
log_begin_msg () {
- /etc/core-lsb/lsb_log_message begin "$@"
+ if [ -z "$1" ]; then
+ return 1
+ fi
+ echo " * $@"
}
+
log_end_msg () {
/etc/core-lsb/lsb_log_message end "$@"
}
diff --git a/meta/recipes-extended/lsb/lsb/lsb_log_message b/meta/recipes-extended/lsb/lsb/lsb_log_message
index a716518..10343b0 100755
--- a/meta/recipes-extended/lsb/lsb/lsb_log_message
+++ b/meta/recipes-extended/lsb/lsb/lsb_log_message
@@ -21,11 +21,6 @@ case "$ACTION" in
warning "$*"
echo
;;
- begin)
- echo -n $*
- begin "$*"
- echo
- ;;
*)
;;
esac
More information about the Openembedded-commits
mailing list