Attachment #124064 for bug #183861




# Some terminals have darkyellow instead of brown.
codes["0xAAAA00"]   = codes["brown"]
codes["darkyellow"] = codes["0xAAAA00"]
codes["fuscia"]     = codes["fuchsia"]
codes["white"]      = codes["bold"]

codes["bg_black"]      = esc_seq + "40m"
codes["bg_darkred"]    = esc_seq + "41m"
codes["bg_darkgreen"]  = esc_seq + "42m"
codes["bg_brown"]      = esc_seq + "43m"
codes["bg_darkblue"]   = esc_seq + "44m"
codes["bg_purple"]     = esc_seq + "45m"
codes["bg_teal"]       = esc_seq + "46m"
codes["bg_lightgray"]  = esc_seq + "47m"

codes["bg_darkyellow"] = codes["bg_brown"]

# Colors from /sbin/functions.sh
codes["GOOD"]       = codes["green"]
codes["WARN"]       = codes["yellow"]

		return text

compat_functions_colors = ["bold","white","teal","turquoise","darkteal",
	"fuchsia","purple","blue","darkblue","green","darkgreen","yellow",
	"brown","darkyellow","red","darkred"]

def create_color_func(color_key):

Lines 694-700 Link Here

(-)pym/emerge/__init__.py (-7 / +7 lines)
694	atom will be returned. Atoms that are in the system set may also be stored	694	atom will be returned. Atoms that are in the system set may also be stored
695	in world since system atoms can only match one slot while world atoms can	695	in world since system atoms can only match one slot while world atoms can
696	be greedy with respect to slots. Unslotted system packages will not be	696	be greedy with respect to slots. Unslotted system packages will not be
697	not be stored in world."""	697	stored in world."""
698	arg_atom = args_set.findAtomForPackage(pkg_key, metadata)	698	arg_atom = args_set.findAtomForPackage(pkg_key, metadata)
699	cp = portage.dep_getkey(arg_atom)	699	cp = portage.dep_getkey(arg_atom)
700	new_world_atom = cp	700	new_world_atom = cp
Lines 3060-3076 Link Here
3060		3060
3061	def pkgprint(pkg):	3061	def pkgprint(pkg):
3062	if pkg_merge:	3062	if pkg_merge:
3063	if pkg_world:	3063	if pkg_system:
		3064	return colorize("PKG_MERGE_SYSTEM", pkg)
		3065	elif pkg_world:
3064	return colorize("PKG_MERGE_WORLD", pkg)	3066	return colorize("PKG_MERGE_WORLD", pkg)
3065	elif pkg_system:
3066	return colorize("PKG_MERGE_SYSTEM", pkg)
3067	else:	3067	else:
3068	return colorize("PKG_MERGE", pkg)	3068	return colorize("PKG_MERGE", pkg)
3069	else:	3069	else:
3070	if pkg_world:	3070	if pkg_system:
		3071	return colorize("PKG_NOMERGE_SYSTEM", pkg)
		3072	elif pkg_world:
3071	return colorize("PKG_NOMERGE_WORLD", pkg)	3073	return colorize("PKG_NOMERGE_WORLD", pkg)
3072	elif pkg_system:
3073	return colorize("PKG_NOMERGE_SYSTEM", pkg)
3074	else:	3074	else:
3075	return colorize("PKG_NOMERGE", pkg)	3075	return colorize("PKG_NOMERGE", pkg)
3076		3076




.TH "COLOR.MAP" "5" "Jul 2007" "Portage 2.1.3" "Portage"
.SH "NAME"
color.map \- custom color settings for Portage
.SH "SYNOPSIS"

Portage will check this file first for color classes settings. If no setting
of given color class is found in /etc/portage/color.map, Portage uses default
value defined internally.
.SH "SYNTAX"
\fBVARIABLE\fR = \fI[space delimited list of attributes]\fR
.SH "VARIABLES"
.TP
\fBBAD\fR = \fI"red"\fR
Defines color used for some words occuring in bad context.
.TP
\fBBRACKET\fR = \fI"blue"\fR
Defines color used for brackets.
.TP
\fBGOOD\fR = \fI"green"\fR
Defines color used for some words occuring in good context.
.TP
\fBHILITE\fR = \fI"teal"\fR
Defines color used for highlighted words.
.TP
\fBINFORM\fR = \fI"darkgreen"\fR
Defines color used for informational words.
.TP
\fBMERGE_LIST_PROGRESS\fR = \fI"yellow"\fR
Defines color used for numbers indicating merge progress.
.TP
\fBPKG_MERGE\fR = \fI"darkgreen"\fR
Defines color used for packages planned to be merged.
.TP
\fBPKG_MERGE_SYSTEM\fR = \fI"darkgreen"\fR
Defines color used for system packages planned to be merged.
system set.
.TP
\fBPKG_MERGE_WORLD\fR = \fI"green"\fR
Defines color used for world packages planned to be merged.
world set.
.TP
\fBPKG_NOMERGE\fR = \fI"darkblue"\fR
Defines color used for packages not planned to be merged.
.TP
\fBPKG_NOMERGE_SYSTEM\fR = \fI"darkblue"\fR
Defines color used for system packages not planned to be merged.
system set.
.TP
\fBPKG_NOMERGE_WORLD\fR = \fI"blue"\fR
Defines color used for world packages not planned to be merged.
world set.
.TP
\fBSECURITY_WARN\fR = \fI"red"\fR
Defines color used for security warnings.
.TP
\fBUNMERGE_WARN\fR = \fI"red"\fR
Defines color used for unmerge warnings.
.TP
\fBWARN\fR = \fI"yellow"\fR
Defines color used for warnings.
.SH "LIST OF VALID ATTRIBUTES"
.TP
.B Foreground colors
.RS
.TP
.B black
.TP
.B darkgray
.TP
.B darkred
.TP
.B red
.TP
.B darkgreen
.TP
.B green
.TP
\fBbrown\fR = \fBdarkyellow\fR
.TP
.B yellow
.TP
.B darkblue
.TP
.B blue
.TP
.B purple
.TP
.B fuchsia
.TP
.B teal
.TP
.B turquoise
.TP
.B lightgray
.TP
.B white
.RE
.TP
.B Background colors
.RS
.TP
.B bg_black
.TP
.B bg_darkred
.TP
.B bg_darkgreen
.TP
\fBbg_brown\fR = \fBbg_darkyellow\fR
.TP
.B bg_darkblue
.TP
.B bg_purple
.TP
.B bg_teal
.TP
.B bg_lightgray
.RE
.TP
.B Other attributes
.RS
.TP
.B bold
.TP
.B faint
.TP
.B standout
.TP
.B underline
.TP
.B blink
.TP
.B reverse
.RE
.SH "REPORTING BUGS"
Please report bugs via http://bugs.gentoo.org/
.SH "AUTHORS"

.B /etc/make.conf
Contains other variables.
.SH "SEE ALSO"
.BR console_codes (4),
.BR make.conf (5),
.BR portage (5),
.BR emerge (1),

Return to bug 183861

Lines 117-134 Link Here

(-)pym/portage/output.py (-11 / +11 lines)
117	# Some terminals have darkyellow instead of brown.	117	# Some terminals have darkyellow instead of brown.
118	codes["0xAAAA00"] = codes["brown"]	118	codes["0xAAAA00"] = codes["brown"]
119	codes["darkyellow"] = codes["0xAAAA00"]	119	codes["darkyellow"] = codes["0xAAAA00"]
120	codes["fuscia"] = codes["fuchsia"]
121	codes["white"] = codes["bold"]
122		120
123	codes["bg_black"] = esc_seq + "40m"	121	codes["bg_black"] = esc_seq + "40m"
124	codes["bg_red"] = esc_seq + "41m"	122	codes["bg_darkred"] = esc_seq + "41m"
125	codes["bg_green"] = esc_seq + "42m"	123	codes["bg_darkgreen"] = esc_seq + "42m"
126	codes["bg_brown"] = esc_seq + "43m"	124	codes["bg_brown"] = esc_seq + "43m"
127	codes["bg_blue"] = esc_seq + "44m"	125	codes["bg_darkblue"] = esc_seq + "44m"
128	codes["bg_magenta"] = esc_seq + "45m"	126	codes["bg_purple"] = esc_seq + "45m"
129	codes["bg_cyan"] = esc_seq + "46m"	127	codes["bg_teal"] = esc_seq + "46m"
130	codes["bg_white"] = esc_seq + "47m"	128	codes["bg_lightgray"] = esc_seq + "47m"
131		129
		130	codes["bg_darkyellow"] = codes["bg_brown"]
		131
132	# Colors from /sbin/functions.sh	132	# Colors from /sbin/functions.sh
133	codes["GOOD"] = codes["green"]	133	codes["GOOD"] = codes["green"]
134	codes["WARN"] = codes["yellow"]	134	codes["WARN"] = codes["yellow"]
Lines 288-294 Link Here
288	return text	288	return text
289		289
290	compat_functions_colors = ["bold","white","teal","turquoise","darkteal",	290	compat_functions_colors = ["bold","white","teal","turquoise","darkteal",
291	"fuscia","fuchsia","purple","blue","darkblue","green","darkgreen","yellow",	291	"fuchsia","purple","blue","darkblue","green","darkgreen","yellow",
292	"brown","darkyellow","red","darkred"]	292	"brown","darkyellow","red","darkred"]
293		293
294	def create_color_func(color_key):	294	def create_color_func(color_key):

Lines 1-4 Link Here

(-)man/color.map.5 (-25 / +97 lines)
1	.TH "COLOR.MAP" "5" "Jun 2007" "Portage 2.1.3" "Portage"	1	.TH "COLOR.MAP" "5" "Jul 2007" "Portage 2.1.3" "Portage"
2	.SH "NAME"	2	.SH "NAME"
3	color.map \- custom color settings for Portage	3	color.map \- custom color settings for Portage
4	.SH "SYNOPSIS"	4	.SH "SYNOPSIS"
Lines 8-63 Link Here
8	Portage will check this file first for color classes settings. If no setting	8	Portage will check this file first for color classes settings. If no setting
9	of given color class is found in /etc/portage/color.map, Portage uses default	9	of given color class is found in /etc/portage/color.map, Portage uses default
10	value defined internally.	10	value defined internally.
		11	.SH "SYNTAX"
		12	\fBVARIABLE\fR = \fI[space delimited list of attributes]\fR
11	.SH "VARIABLES"	13	.SH "VARIABLES"
12	.TP	14	.TP
13	\fBBAD\fR = \fI"0xFF5555"\fR	15	\fBBAD\fR = \fI"red"\fR
14	Defines color used for some words occuring in bad context.	16	Defines color used for some words occuring in bad context.
15	.TP	17	.TP
16	\fBBRACKET\fR = \fI"0x5555FF"\fR	18	\fBBRACKET\fR = \fI"blue"\fR
17	Defines color used for brackets.	19	Defines color used for brackets.
18	.TP	20	.TP
19	\fBGOOD\fR = \fI"0x55FF55"\fR	21	\fBGOOD\fR = \fI"green"\fR
20	Defines color used for some words occuring in good context.	22	Defines color used for some words occuring in good context.
21	.TP	23	.TP
22	\fBHILITE\fR = \fI"0x00AAAA"\fR	24	\fBHILITE\fR = \fI"teal"\fR
23	Defines color used for highlighted words.	25	Defines color used for highlighted words.
24	.TP	26	.TP
25	\fBINFORM\fR = \fI"0x00AA00"\fR	27	\fBINFORM\fR = \fI"darkgreen"\fR
26	Defines color used for informational words.	28	Defines color used for informational words.
27	.TP	29	.TP
28	\fBMERGE_LIST_PROGRESS\fR = \fI"0xFFFF55"\fR	30	\fBMERGE_LIST_PROGRESS\fR = \fI"yellow"\fR
29	Defines color used for numbers used in merge progress lists.	31	Defines color used for numbers indicating merge progress.
30	.TP	32	.TP
31	\fBPKG_MERGE\fR = \fI"0x00AA00"\fR	33	\fBPKG_MERGE\fR = \fI"darkgreen"\fR
32	Defines color used for packages planned to be merged.	34	Defines color used for packages planned to be merged.
33	.TP	35	.TP
34	\fBPKG_MERGE_SYSTEM\fR = \fI"0x00AA00"\fR	36	\fBPKG_MERGE_SYSTEM\fR = \fI"darkgreen"\fR
35	Defines color used for packages planned to be merged and belonging to	37	Defines color used for system packages planned to be merged.
36	system set.
37	.TP	38	.TP
38	\fBPKG_MERGE_WORLD\fR = \fI"0x55FF55"\fR	39	\fBPKG_MERGE_WORLD\fR = \fI"green"\fR
39	Defines color used for packages planned to be merged and belonging to	40	Defines color used for world packages planned to be merged.
40	world set.
41	.TP	41	.TP
42	\fBPKG_NOMERGE\fR = \fI"0x0000AA"\fR	42	\fBPKG_NOMERGE\fR = \fI"darkblue"\fR
43	Defines color used for packages not planned to be merged.	43	Defines color used for packages not planned to be merged.
44	.TP	44	.TP
45	\fBPKG_NOMERGE_SYSTEM\fR = \fI"0x0000AA"\fR	45	\fBPKG_NOMERGE_SYSTEM\fR = \fI"darkblue"\fR
46	Defines color used for packages not planned to be merged and belonging to	46	Defines color used for system packages not planned to be merged.
47	system set.
48	.TP	47	.TP
49	\fBPKG_NOMERGE_WORLD\fR = \fI"0x5555FF"\fR	48	\fBPKG_NOMERGE_WORLD\fR = \fI"blue"\fR
50	Defines color used for packages not planned to be merged and belonging to	49	Defines color used for world packages not planned to be merged.
51	world set.
52	.TP	50	.TP
53	\fBSECURITY_WARN\fR = \fI"0xFF5555"\fR	51	\fBSECURITY_WARN\fR = \fI"red"\fR
54	Defines color used for security warnings.	52	Defines color used for security warnings.
55	.TP	53	.TP
56	\fBUNMERGE_WARN\fR = \fI"0xFF5555"\fR	54	\fBUNMERGE_WARN\fR = \fI"red"\fR
57	Defines color used for unmerge warnings.	55	Defines color used for unmerge warnings.
58	.TP	56	.TP
59	\fBWARN\fR = \fI"0xFFFF55"\fR	57	\fBWARN\fR = \fI"yellow"\fR
60	Defines color used for warnings.	58	Defines color used for warnings.
		59	.SH "LIST OF VALID ATTRIBUTES"
		60	.TP
		61	.B Foreground colors
		62	.RS
		63	.TP
		64	.B black
		65	.TP
		66	.B darkgray
		67	.TP
		68	.B darkred
		69	.TP
		70	.B red
		71	.TP
		72	.B darkgreen
		73	.TP
		74	.B green
		75	.TP
		76	\fBbrown\fR = \fBdarkyellow\fR
		77	.TP
		78	.B yellow
		79	.TP
		80	.B darkblue
		81	.TP
		82	.B blue
		83	.TP
		84	.B purple
		85	.TP
		86	.B fuchsia
		87	.TP
		88	.B teal
		89	.TP
		90	.B turquoise
		91	.TP
		92	.B lightgray
		93	.TP
		94	.B white
		95	.RE
		96	.TP
		97	.B Background colors
		98	.RS
		99	.TP
		100	.B bg_black
		101	.TP
		102	.B bg_darkred
		103	.TP
		104	.B bg_darkgreen
		105	.TP
		106	\fBbg_brown\fR = \fBbg_darkyellow\fR
		107	.TP
		108	.B bg_darkblue
		109	.TP
		110	.B bg_purple
		111	.TP
		112	.B bg_teal
		113	.TP
		114	.B bg_lightgray
		115	.RE
		116	.TP
		117	.B Other attributes
		118	.RS
		119	.TP
		120	.B bold
		121	.TP
		122	.B faint
123	.TP
124	.B standout
125	.TP
126	.B underline
127	.TP
128	.B blink
129	.TP
130	.B reverse
131	.RE
61	.SH "REPORTING BUGS"	132	.SH "REPORTING BUGS"
62	Please report bugs via http://bugs.gentoo.org/	133	Please report bugs via http://bugs.gentoo.org/
63	.SH "AUTHORS"	134	.SH "AUTHORS"
Lines 72-77 Link Here
72	.B /etc/make.conf	143	.B /etc/make.conf
73	Contains other variables.	144	Contains other variables.
74	.SH "SEE ALSO"	145	.SH "SEE ALSO"
		146	.BR console_codes (4),
75	.BR make.conf (5),	147	.BR make.conf (5),
76	.BR portage (5),	148	.BR portage (5),
77	.BR emerge (1),	149	.BR emerge (1),