Attachment #228141 for bug #315735

Lines 1314-1320 for x in scanlist: Link Here

(-)a/bin/repoman (-1 / +7 lines)
1314	del e	1314	del e
1315	else:	1315	else:
1316	# load USE flags from metadata.xml	1316	# load USE flags from metadata.xml
1317	utilities.parse_metadata_use(_metadata_xml, muselist)	1317	try:
		1318	utilities.parse_metadata_use(_metadata_xml, muselist)
		1319	except portage.exception.ParseError as e:
		1320	metadata_bad = True
		1321	stats["metadata.bad"] += 1
		1322	fails["metadata.bad"].append("%s/metadata.xml: %s" % (x, e))
		1323	muselist = []
1318		1324
1319	# Run other metadata.xml checkers	1325	# Run other metadata.xml checkers
1320	try:	1326	try:





	flags = usetag[0].findall("flag")
	if not flags:
		raise exception.ParseError("missing 'flag' tag(s)")
			"Malformed input: missing 'flag' tag(s)")

	for flag in flags:
		pkg_flag = flag.get("name")
		if pkg_flag is None:
			raise exception.ParseError("missing 'name' attribute for 'flag' tag")
				"Malformed input: missing 'name' attribute for 'flag' tag")
		uselist.append(pkg_flag)
	return uselist


Return to bug 315735

Lines 119-132 def parse_metadata_use(xml_tree, uselist=None): Link Here

(-)a/pym/repoman/utilities.py (-4 / +2 lines)
119		119
120	flags = usetag[0].findall("flag")	120	flags = usetag[0].findall("flag")
121	if not flags:	121	if not flags:
122	raise exception.ParseError("metadata.xml: " + \	122	raise exception.ParseError("missing 'flag' tag(s)")
123	"Malformed input: missing 'flag' tag(s)")
124		123
125	for flag in flags:	124	for flag in flags:
126	pkg_flag = flag.get("name")	125	pkg_flag = flag.get("name")
127	if pkg_flag is None:	126	if pkg_flag is None:
128	raise exception.ParseError("metadata.xml: " + \	127	raise exception.ParseError("missing 'name' attribute for 'flag' tag")
129	"Malformed input: missing 'name' attribute for 'flag' tag")
130	uselist.append(pkg_flag)	128	uselist.append(pkg_flag)
131	return uselist	129	return uselist
132		130