From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 25 Oct 2016 08:00:06 +0000 (+0200)
Subject: systemctl: properly turn off color after active column
X-Git-Tag: v232~6^2~5
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=835a19e02fa96a5f13700d0ce9f4b1813d0c1ad6;p=systemd%2F.git

systemctl: properly turn off color after active column

If we turn on red color for the active column and it is not combined with
underlining, then we need to turn it off explicitly afterwards. Do that.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index d311bbec1a..558186bd8a 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -513,13 +513,13 @@ static int output_units_list(const UnitInfo *unit_infos, unsigned c) {
                         off_circle = ansi_normal();
                         circle = true;
                         on_loaded = underline ? ansi_highlight_red_underline() : ansi_highlight_red();
-                        off_loaded = on_underline;
+                        off_loaded = underline ? on_underline : ansi_normal();
                 } else if (streq(u->active_state, "failed") && !arg_plain) {
                         on_circle = ansi_highlight_red();
                         off_circle = ansi_normal();
                         circle = true;
                         on_active = underline ? ansi_highlight_red_underline() : ansi_highlight_red();
-                        off_active = on_underline;
+                        off_active = underline ? on_underline : ansi_normal();
                 }
 
                 if (u->machine) {