lsb 3.2-19 Debian release.

diff --git a/debian/changelog b/debian/changelog
index d4d65d1462b0e6e161b6c2796a98163e99ca46be..90e9409e7164a7e9bb2bf71186f2f4c361527162 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lsb (3.2-19) unstable; urgency=low
+
+  * Return 0 in log_failure_msg too.
+  
+ -- Chris Lawrence <lawrencc@debian.org>  Mon, 04 Aug 2008 20:29:54 -0500
+
 lsb (3.2-18) unstable; urgency=low
 
   * Also fix case where stdout isn't color-capable.  (Closes: #493505, again)

diff --git a/init-functions b/init-functions
index 5e4b4ae23406a14d97958000602997c87396aee8..3d6847c57771e2186bfb4193e3f572af6e9180d8 100644 (file)
--- a/init-functions
+++ b/init-functions
@@ -201,14 +201,14 @@ log_failure_msg () {
     if [ -n "${1:-}" ]; then
         log_begin_msg $@
     fi
-    log_end_msg 1
+    log_end_msg 1 || true
 }
 
 log_warning_msg () {
     if [ -n "${1:-}" ]; then
         log_begin_msg $@
     fi
-    log_end_msg 255
+    log_end_msg 255 || true
 }
 
 #
@@ -311,7 +311,6 @@ log_end_msg () {
         echo "."
     elif [ $1 -eq 255 ]; then
         /bin/echo -e " ${YELLOW}(warning).${NORMAL}"
-        retval=0
     else
         /bin/echo -e " ${RED}failed!${NORMAL}"
     fi

diff --git a/test/lsb-test.sh b/test/lsb-test.sh
index 663d133ec2301e272ff16222c242d3b7adf0dba2..1168a62d320218dcdef78862d6101a110d1ab4c3 100644 (file)
--- a/test/lsb-test.sh
+++ b/test/lsb-test.sh
@@ -4,5 +4,7 @@ echo "Importing $1/init-functions"
 . $1/init-functions
 
 log_warning_msg "Only a warning"
+log_success_msg "This should succeed"
+log_failure_msg "This fails miserably"
 
 echo "OK!"