1 |
These prevent NOCOLOR in make.conf or emerge --color=n from working |
2 |
correctly, and may also be problematic for accessibility. |
3 |
|
4 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
5 |
--- |
6 |
eclass/git-r3.eclass | 18 +++++++++--------- |
7 |
1 file changed, 9 insertions(+), 9 deletions(-) |
8 |
|
9 |
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass |
10 |
index e0d2bbb5edc0..144236c6ac38 100644 |
11 |
--- a/eclass/git-r3.eclass |
12 |
+++ b/eclass/git-r3.eclass |
13 |
@@ -227,19 +227,19 @@ _git-r3_env_setup() { |
14 |
;; |
15 |
single) |
16 |
if [[ ${EGIT_CLONE_TYPE} == shallow ]]; then |
17 |
- einfo "git-r3: ebuild needs to be cloned in '\e[1msingle\e[22m' mode, adjusting" |
18 |
+ einfo "git-r3: ebuild needs to be cloned in 'single' mode, adjusting" |
19 |
EGIT_CLONE_TYPE=single |
20 |
fi |
21 |
;; |
22 |
single+tags) |
23 |
if [[ ${EGIT_CLONE_TYPE} == shallow || ${EGIT_CLONE_TYPE} == single ]]; then |
24 |
- einfo "git-r3: ebuild needs to be cloned in '\e[1msingle+tags\e[22m' mode, adjusting" |
25 |
+ einfo "git-r3: ebuild needs to be cloned in 'single+tags' mode, adjusting" |
26 |
EGIT_CLONE_TYPE=single+tags |
27 |
fi |
28 |
;; |
29 |
mirror) |
30 |
if [[ ${EGIT_CLONE_TYPE} != mirror ]]; then |
31 |
- einfo "git-r3: ebuild needs to be cloned in '\e[1mmirror\e[22m' mode, adjusting" |
32 |
+ einfo "git-r3: ebuild needs to be cloned in 'mirror' mode, adjusting" |
33 |
EGIT_CLONE_TYPE=mirror |
34 |
fi |
35 |
;; |
36 |
@@ -439,7 +439,7 @@ _git-r3_set_submodules() { |
37 |
done |
38 |
|
39 |
if [[ ! ${res} ]]; then |
40 |
- einfo "Skipping submodule \e[1m${subname}\e[22m" |
41 |
+ einfo "Skipping submodule ${subname}" |
42 |
continue |
43 |
fi |
44 |
fi |
45 |
@@ -658,7 +658,7 @@ git-r3_fetch() { |
46 |
fi |
47 |
for r in "${repos[@]}"; do |
48 |
if [[ ! ${EVCS_OFFLINE} ]]; then |
49 |
- einfo "Fetching \e[1m${r}\e[22m ..." |
50 |
+ einfo "Fetching ${r} ..." |
51 |
|
52 |
local fetch_command=( git fetch "${r}" ) |
53 |
local clone_type=${EGIT_CLONE_TYPE} |
54 |
@@ -892,7 +892,7 @@ git-r3_checkout() { |
55 |
local -x GIT_DIR |
56 |
_git-r3_set_gitdir "${repos[0]}" |
57 |
|
58 |
- einfo "Checking out \e[1m${repos[0]}\e[22m to \e[1m${out_dir}\e[22m ..." |
59 |
+ einfo "Checking out ${repos[0]} to ${out_dir} ..." |
60 |
|
61 |
if ! git cat-file -e refs/git-r3/"${local_id}"/__main__; then |
62 |
die "Logic error: no local clone of ${repos[0]}. git-r3_fetch not used?" |
63 |
@@ -1042,7 +1042,7 @@ git-r3_peek_remote_ref() { |
64 |
|
65 |
local r success |
66 |
for r in "${repos[@]}"; do |
67 |
- einfo "Peeking \e[1m${remote_ref}\e[22m on \e[1m${r}\e[22m ..." >&2 |
68 |
+ einfo "Peeking ${remote_ref} on ${r} ..." >&2 |
69 |
|
70 |
local lookup_ref |
71 |
if [[ ${remote_ref} == refs/* || ${remote_ref} == HEAD ]] |
72 |
@@ -1098,9 +1098,9 @@ git-r3_pkg_needrebuild() { |
73 |
[[ ${new_commit_id} && ${EGIT_VERSION} ]] || die "Lookup failed" |
74 |
|
75 |
if [[ ${EGIT_VERSION} != ${new_commit_id} ]]; then |
76 |
- einfo "Update from \e[1m${EGIT_VERSION}\e[22m to \e[1m${new_commit_id}\e[22m" |
77 |
+ einfo "Update from ${EGIT_VERSION} to ${new_commit_id}" |
78 |
else |
79 |
- einfo "Local and remote at \e[1m${EGIT_VERSION}\e[22m" |
80 |
+ einfo "Local and remote at ${EGIT_VERSION}" |
81 |
fi |
82 |
|
83 |
[[ ${EGIT_VERSION} != ${new_commit_id} ]] |
84 |
-- |
85 |
2.24.1 |