Attachment #212189 for bug #295805




		config_file = os.path.join(abs_user_config, x)
		if os.path.isdir(config_file):
			for parent, dirs, files in os.walk(config_file):
				try:
					parent = _unicode_decode(parent,
						encoding=_encodings['fs'], errors='strict')
				except UnicodeDecodeError:
					continue
				for y_enc in dirs:
					try:
						y = _unicode_decode(y_enc,
							encoding=_encodings['fs'], errors='strict')
					except UnicodeDecodeError:
						dirs.remove(y_enc)
						continue
					if y.startswith("."):
						dirs.remove(y_enc)
				for y in files:
					try:
						y = _unicode_decode(y,

Return to bug 295805

Lines 201-215 Link Here

(-)pym/portage/update.py (-4 / +9 lines)
201	config_file = os.path.join(abs_user_config, x)	201	config_file = os.path.join(abs_user_config, x)
202	if os.path.isdir(config_file):	202	if os.path.isdir(config_file):
203	for parent, dirs, files in os.walk(config_file):	203	for parent, dirs, files in os.walk(config_file):
204	for y in dirs:	204	try:
		205	parent = _unicode_decode(parent,
		206	encoding=_encodings['fs'], errors='strict')
		207	except UnicodeDecodeError:
		208	continue
		209	for y_enc in dirs:
205	try:	210	try:
206	y = _unicode_decode(y,	211	y = _unicode_decode(y_enc,
207	encoding=_encodings['fs'], errors='strict')	212	encoding=_encodings['fs'], errors='strict')
208	except UnicodeDecodeError:	213	except UnicodeDecodeError:
209	dirs.remove(y)	214	dirs.remove(y_enc)
210	continue	215	continue
211	if y.startswith("."):	216	if y.startswith("."):
212	dirs.remove(y)	217	dirs.remove(y_enc)
213	for y in files:	218	for y in files:
214	try:	219	try:
215	y = _unicode_decode(y,	220	y = _unicode_decode(y,