[SCM] Debian Live build scripts branch, master, updated. 1.0.2-2-12-g5c73d67
Chris Lamb
lamby at debian.org
Sat Jan 10 14:50:01 UTC 2009
The following commit has been merged in the master branch:
commit 6f58247946ba20d3d8139b8aed33ea49df55f643
Author: Chris Lamb <lamby at debian.org>
Date: Sat Jan 10 14:42:12 2009 +0000
Revert "Corrected value of disabled _COLOR option from "false" => "disabled"."
This reverts commit 9792b9fffd0f610b1889eccf5dc5fcf88bf84fc8.
diff --git a/functions/echo.sh b/functions/echo.sh
index 7a30831..c217dbd 100755
--- a/functions/echo.sh
+++ b/functions/echo.sh
@@ -50,7 +50,7 @@ Echo_debug_running ()
printf "D: $(eval_gettext "${STRING}")" "${@}"
fi
- if [ "${_COLOR}" = "disabled" ]
+ if [ "${_COLOR}" = "false" ]
then
printf "..."
else
@@ -64,7 +64,7 @@ Echo_error ()
STRING="${1}"
shift
- if [ "${_COLOR}" = "disabled" ]
+ if [ "${_COLOR}" = "false" ]
then
printf "E:"
else
@@ -86,7 +86,7 @@ Echo_message ()
STRING="${1}"
shift
- if [ "${_COLOR}" = "disabled" ]
+ if [ "${_COLOR}" = "false" ]
then
printf "P:"
else
@@ -109,7 +109,7 @@ Echo_message_running ()
STRING="${1}"
shift
- if [ "${_COLOR}" = "disabled" ]
+ if [ "${_COLOR}" = "false" ]
then
printf "P:"
else
@@ -123,7 +123,7 @@ Echo_message_running ()
printf " $(eval_gettext "${STRING}")" "${@}";
fi
- if [ "${_COLOR}" = "disabled" ]
+ if [ "${_COLOR}" = "false" ]
then
printf "..."
else
@@ -176,7 +176,7 @@ Echo_warning ()
STRING="${1}"
shift
- if [ "${_COLOR}" = "disabled" ]
+ if [ "${_COLOR}" = "false" ]
then
printf "W:"
else
@@ -195,7 +195,7 @@ Echo_status ()
{
__RETURN="${?}"
- if [ "${_COLOR}" = "disabled" ]
+ if [ "${_COLOR}" = "false" ]
then
if [ "${__RETURN}" = "0" ]
then
@@ -217,7 +217,7 @@ Echo_status ()
Echo_done ()
{
- if [ "${_COLOR}" = "disabled" ]
+ if [ "${_COLOR}" = "false" ]
then
printf " already done.\n"
else
--
Debian Live build scripts
More information about the debian-live-changes
mailing list