Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 183861 | Differences between
and this patch

Collapse All | Expand All

(-)pym/portage/output.py (-16 / +34 lines)
Lines 73-78 Link Here
73
codes["underline"] = esc_seq + "04m"
73
codes["underline"] = esc_seq + "04m"
74
codes["blink"]     = esc_seq + "05m"
74
codes["blink"]     = esc_seq + "05m"
75
codes["overline"]  = esc_seq + "06m"  # Who made this up? Seriously.
75
codes["overline"]  = esc_seq + "06m"  # Who made this up? Seriously.
76
codes["reverse"]   = esc_seq + "07m"
76
77
77
ansi_color_codes = []
78
ansi_color_codes = []
78
for x in xrange(30, 38):
79
for x in xrange(30, 38):
Lines 119-124 Link Here
119
codes["fuscia"]     = codes["fuchsia"]
120
codes["fuscia"]     = codes["fuchsia"]
120
codes["white"]      = codes["bold"]
121
codes["white"]      = codes["bold"]
121
122
123
codes["bg_black"]   = esc_seq + "40m"
124
codes["bg_red"]     = esc_seq + "41m"
125
codes["bg_green"]   = esc_seq + "42m"
126
codes["bg_brown"]   = esc_seq + "43m"
127
codes["bg_blue"]    = esc_seq + "44m"
128
codes["bg_magenta"] = esc_seq + "45m"
129
codes["bg_cyan"]    = esc_seq + "46m"
130
codes["bg_white"]   = esc_seq + "47m"
131
122
# Colors from /sbin/functions.sh
132
# Colors from /sbin/functions.sh
123
codes["GOOD"]       = codes["green"]
133
codes["GOOD"]       = codes["green"]
124
codes["WARN"]       = codes["yellow"]
134
codes["WARN"]       = codes["yellow"]
Lines 127-144 Link Here
127
codes["BRACKET"]    = codes["blue"]
137
codes["BRACKET"]    = codes["blue"]
128
138
129
# Portage functions
139
# Portage functions
130
codes["INFORM"] = codes["darkgreen"]
140
codes["INFORM"]                  = codes["darkgreen"]
131
codes["UNMERGE_WARN"] = codes["red"]
141
codes["UNMERGE_WARN"]            = codes["red"]
132
codes["SECURITY_WARN"] = codes["red"]
142
codes["SECURITY_WARN"]           = codes["red"]
133
codes["MERGE_LIST_PROGRESS"] = codes["yellow"]
143
codes["MERGE_LIST_PROGRESS"]     = codes["yellow"]
134
codes["PKG_MERGE"]           = codes["darkgreen"]
144
codes["PKG_MERGE"]               = codes["darkgreen"]
135
codes["PKG_MERGE_ARG"]       = codes["darkgreen"]
145
codes["PKG_MERGE_ARG"]           = codes["darkgreen"]
136
codes["PKG_MERGE_SYSTEM"]    = codes["green"]
146
codes["PKG_MERGE_SYSTEM"]        = codes["green"]
137
codes["PKG_MERGE_WORLD"]     = codes["green"]
147
codes["PKG_MERGE_WORLD"]         = codes["green"]
138
codes["PKG_NOMERGE"]         = codes["darkblue"]
148
codes["PKG_MERGE_ARG_SYSTEM"]    = codes["green"]
139
codes["PKG_NOMERGE_ARG"]     = codes["darkblue"]
149
codes["PKG_MERGE_ARG_WORLD"]     = codes["green"]
140
codes["PKG_NOMERGE_SYSTEM"]  = codes["blue"]
150
codes["PKG_NOMERGE"]             = codes["darkblue"]
141
codes["PKG_NOMERGE_WORLD"]   = codes["blue"]
151
codes["PKG_NOMERGE_ARG"]         = codes["darkblue"]
152
codes["PKG_NOMERGE_SYSTEM"]      = codes["blue"]
153
codes["PKG_NOMERGE_WORLD"]       = codes["blue"]
154
codes["PKG_NOMERGE_ARG_SYSTEM"]  = codes["blue"]
155
codes["PKG_NOMERGE_ARG_WORLD"]   = codes["blue"]
142
156
143
def parse_color_map():
157
def parse_color_map():
144
	myfile = COLOR_MAP_FILE
158
	myfile = COLOR_MAP_FILE
Lines 159-171 Link Here
159
				raise ParseError("%s%s'%s'" % (s.error_leader(myfile, s.lineno), "expected '=' operator: ", o))
173
				raise ParseError("%s%s'%s'" % (s.error_leader(myfile, s.lineno), "expected '=' operator: ", o))
160
			k = strip_quotes(k, s.quotes)
174
			k = strip_quotes(k, s.quotes)
161
			v = strip_quotes(v, s.quotes)
175
			v = strip_quotes(v, s.quotes)
176
			if not k in codes:
177
				print ParseError("%s%s'%s'" % (s.error_leader(myfile, s.lineno), "Unknown variable: ", k))
178
				continue
162
			if ansi_code_pattern.match(v):
179
			if ansi_code_pattern.match(v):
163
				codes[k] = esc_seq + v
180
				codes[k] = esc_seq + v
164
			else:
181
			else:
165
				if v in codes:
182
				for x in v.split(" "):
166
					codes[k] = codes[v]
183
					if x in codes:
167
				else:
184
						codes[k] = codes[k] + codes[x]
168
					raise ParseError("%s%s'%s'" % (s.error_leader(myfile, s.lineno), "Undefined: ", v))
185
					else:
186
						print ParseError("%s%s'%s'" % (s.error_leader(myfile, s.lineno), "Undefined: ", x))
169
	except (IOError, OSError), e:
187
	except (IOError, OSError), e:
170
		if e.errno == errno.ENOENT:
188
		if e.errno == errno.ENOENT:
171
			raise FileNotFound(myfile)
189
			raise FileNotFound(myfile)

Return to bug 183861