From da50b12d4c6eeca8dda1f97e49163c611c2b78b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 26 Aug 2010 18:51:14 +0200 Subject: Parse flag descriptions in repoman.utilities.parse_metadata_use(). Grab the USE descriptions from metadata.xml within parse_metadata_use(). Instead of a plain flag list, return a dict containing both the flag names and their descriptions. --- bin/repoman | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bin/repoman') diff --git a/bin/repoman b/bin/repoman index 86b4c1c46..0c0e7d0ed 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1335,8 +1335,6 @@ for x in scanlist: fails["changelog.missing"].append(x+"/ChangeLog") #metadata.xml file check - muselist = [] - if "metadata.xml" not in checkdirlist: stats["metadata.missing"]+=1 fails["metadata.missing"].append(x+"/metadata.xml") @@ -1358,12 +1356,12 @@ for x in scanlist: else: # load USE flags from metadata.xml try: - utilities.parse_metadata_use(_metadata_xml, muselist) + musedict = utilities.parse_metadata_use(_metadata_xml) except portage.exception.ParseError as e: metadata_bad = True stats["metadata.bad"] += 1 fails["metadata.bad"].append("%s/metadata.xml: %s" % (x, e)) - muselist = [] + musedict = {} # Run other metadata.xml checkers try: @@ -1389,7 +1387,7 @@ for x in scanlist: fails["metadata.bad"].append(x+"/metadata.xml") del metadata_bad - muselist = frozenset(muselist) + muselist = frozenset(musedict.keys()) changelog_path = os.path.join(checkdir_relative, "ChangeLog") changelog_modified = changelog_path in modified_changelogs -- cgit v1.2.3-1-g7c22