Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH] portage.output: Replace darkblue colors with teal
Date: Sat, 04 Dec 2021 04:48:56
Message-Id: 20211204044849.13275-1-mgorny@gentoo.org
1 The "darkblue" color is often barely visible on dark terminals which
2 makes reading emerge output really hard (I basically have to copy-paste
3 it a lot in order to be able to read it at all). Replace it with teal
4 that does not seem to have any significant use in the output.
5
6 Signed-off-by: Michał Górny <mgorny@g.o>
7 ---
8 lib/portage/output.py | 6 +++---
9 man/color.map.5 | 6 +++---
10 2 files changed, 6 insertions(+), 6 deletions(-)
11
12
13 The before-after screenshot can be found on the PR:
14 https://github.com/gentoo/portage/pull/776
15
16
17 diff --git a/lib/portage/output.py b/lib/portage/output.py
18 index 42f487f8a..77375b012 100644
19 --- a/lib/portage/output.py
20 +++ b/lib/portage/output.py
21 @@ -157,7 +157,7 @@ _styles["UNMERGE_WARN"] = ("red",)
22 _styles["SECURITY_WARN"] = ("red",)
23 _styles["MERGE_LIST_PROGRESS"] = ("yellow",)
24 _styles["PKG_BLOCKER"] = ("red",)
25 -_styles["PKG_BLOCKER_SATISFIED"] = ("darkblue",)
26 +_styles["PKG_BLOCKER_SATISFIED"] = ("teal",)
27 _styles["PKG_MERGE"] = ("darkgreen",)
28 _styles["PKG_MERGE_SYSTEM"] = ("darkgreen",)
29 _styles["PKG_MERGE_WORLD"] = ("green",)
30 @@ -165,8 +165,8 @@ _styles["PKG_BINARY_MERGE"] = ("purple",)
31 _styles["PKG_BINARY_MERGE_SYSTEM"] = ("purple",)
32 _styles["PKG_BINARY_MERGE_WORLD"] = ("fuchsia",)
33 _styles["PKG_UNINSTALL"] = ("red",)
34 -_styles["PKG_NOMERGE"] = ("darkblue",)
35 -_styles["PKG_NOMERGE_SYSTEM"] = ("darkblue",)
36 +_styles["PKG_NOMERGE"] = ("teal",)
37 +_styles["PKG_NOMERGE_SYSTEM"] = ("teal",)
38 _styles["PKG_NOMERGE_WORLD"] = ("blue",)
39 _styles["PROMPT_CHOICE_DEFAULT"] = ("green",)
40 _styles["PROMPT_CHOICE_OTHER"] = ("red",)
41 diff --git a/man/color.map.5 b/man/color.map.5
42 index 288bf7fbd..92a1baa91 100644
43 --- a/man/color.map.5
44 +++ b/man/color.map.5
45 @@ -40,7 +40,7 @@ Defines color used for numbers indicating merge progress.
46 \fBPKG_BLOCKER\fR = \fI"red"\fR
47 Defines color used for unsatisfied blockers.
48 .TP
49 -\fBPKG_BLOCKER_SATISFIED\fR = \fI"darkblue"\fR
50 +\fBPKG_BLOCKER_SATISFIED\fR = \fI"teal"\fR
51 Defines color used for satisfied blockers.
52 .TP
53 \fBPKG_MERGE\fR = \fI"darkgreen"\fR
54 @@ -63,10 +63,10 @@ package.
55 Defines color used for world packages planned to be merged using a binary
56 package.
57 .TP
58 -\fBPKG_NOMERGE\fR = \fI"darkblue"\fR
59 +\fBPKG_NOMERGE\fR = \fI"teal"\fR
60 Defines color used for packages not planned to be merged.
61 .TP
62 -\fBPKG_NOMERGE_SYSTEM\fR = \fI"darkblue"\fR
63 +\fBPKG_NOMERGE_SYSTEM\fR = \fI"teal"\fR
64 Defines color used for system packages not planned to be merged.
65 .TP
66 \fBPKG_NOMERGE_WORLD\fR = \fI"blue"\fR
67 --
68 2.34.1

Replies