From 76d277d5c5f2f404fcfbe5c95de02f12905554c6 Mon Sep 17 00:00:00 2001 From: Chris Lawrence Date: Sun, 3 Aug 2008 10:15:45 -0500 Subject: [PATCH] lsb 3.2-17 Debian release. --- debian/changelog | 7 +++++++ debian/rules | 2 +- init-functions | 12 ++++++++---- init-skeleton => test/init-skeleton | 0 4 files changed, 16 insertions(+), 5 deletions(-) rename init-skeleton => test/init-skeleton (100%) diff --git a/debian/changelog b/debian/changelog index c987317..45e8042 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lsb (3.2-17) unstable; urgency=low + + * log_{success,failure,warning}_msg suck, please don't use them for + Debian scripts. Nonetheless, breakage fixed. (Closes: #493505) + + -- Chris Lawrence Sun, 03 Aug 2008 10:15:45 -0500 + lsb (3.2-16) unstable; urgency=low * Add a bugscript to lsb-release to help figure out why people keep diff --git a/debian/rules b/debian/rules index e21fb84..dc34496 100755 --- a/debian/rules +++ b/debian/rules @@ -122,7 +122,7 @@ binary-arch: build install dh_testroot dh_installdebconf -a dh_installdocs -a - dh_installexamples -a init-skeleton + dh_installexamples -a test/init-skeleton dh_installmenu -a # dh_installlogrotate # dh_installemacsen diff --git a/init-functions b/init-functions index 724a06f..d0fc183 100644 --- a/init-functions +++ b/init-functions @@ -208,7 +208,7 @@ log_warning_msg () { if [ -n "${1:-}" ]; then log_begin_msg $@ fi - log_end_msg -1 + log_end_msg 255 } # @@ -290,6 +290,9 @@ log_end_msg () { if [ -z "${1:-}" ]; then return 1 fi + + retval=$1 + log_end_msg_pre "$@" # Only do the fancy stuff if we have an appropriate terminal @@ -300,22 +303,23 @@ log_end_msg () { NORMAL=`$TPUT op` if [ $1 -eq 0 ]; then echo "." - elif [ $1 -eq -1 ]; then + elif [ $1 -eq 255 ]; then /bin/echo -e " ${YELLOW}(warning).${NORMAL}" + retval=0 else /bin/echo -e " ${RED}failed!${NORMAL}" fi else if [ $1 -eq 0 ]; then echo "." - elif [ $1 -eq -1 ]; then + elif [ $1 -eq 255 ]; then echo -e " (warning)." else echo " failed!" fi fi log_end_msg_post "$@" - return $1 + return $retval } log_action_msg () { diff --git a/init-skeleton b/test/init-skeleton similarity index 100% rename from init-skeleton rename to test/init-skeleton -- 2.30.2