This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=dd00f2a83e4368f0ac5e23b50b9db3e9461fa390 commit dd00f2a83e4368f0ac5e23b50b9db3e9461fa390 Author: Guillem Jover <[email protected]> AuthorDate: Sun Jan 5 02:08:26 2025 +0100 src/sh: Abstract color clearing with a new variable This makes sure we are not losing the original value from COLOR_RESET, in case we need to restore the color clearing later on. --- src/sh/dpkg-error.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/sh/dpkg-error.sh b/src/sh/dpkg-error.sh index 0e0d1a6da..9c393491a 100644 --- a/src/sh/dpkg-error.sh +++ b/src/sh/dpkg-error.sh @@ -60,15 +60,16 @@ always) esac if [ $USE_COLORS = yes ]; then + _dpkg_color_clear="$COLOR_RESET" COLOR_PROG="$COLOR_BOLD" COLOR_INFO="$COLOR_GREEN" COLOR_NOTICE="$COLOR_YELLOW" COLOR_WARN="$COLOR_BOLD_YELLOW" COLOR_ERROR="$COLOR_BOLD_RED" else - COLOR_RESET="" + _dpkg_color_clear="" fi -FMT_PROG="$COLOR_PROG$PROGNAME$COLOR_RESET" +FMT_PROG="$COLOR_PROG$PROGNAME$_dpkg_color_clear" # This function is deprecated and kept only for backwards compatibility. # Deprecated since dpkg 1.22.12. @@ -84,16 +85,16 @@ debug() { } error() { - echo "$FMT_PROG: ${COLOR_ERROR}error${COLOR_RESET}: $*" >&2 + echo "$FMT_PROG: ${COLOR_ERROR}error${_dpkg_color_clear}: $*" >&2 exit 1 } warning() { - echo "$FMT_PROG: ${COLOR_WARN}warning${COLOR_RESET}: $*" >&2 + echo "$FMT_PROG: ${COLOR_WARN}warning${_dpkg_color_clear}: $*" >&2 } badusage() { - echo "$FMT_PROG: ${COLOR_ERROR}error${COLOR_RESET}: $1" >&2 + echo "$FMT_PROG: ${COLOR_ERROR}error${_dpkg_color_clear}: $1" >&2 echo >&2 echo "Use '$PROGNAME --help' for program usage information." >&2 exit 1 -- Dpkg.Org's dpkg
