diff options
| author | Michał Górny <gentoo@mgorny.alt.pl> | 2010-08-26 18:51:14 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-26 10:17:32 -0700 |
| commit | da50b12d4c6eeca8dda1f97e49163c611c2b78b2 (patch) | |
| tree | ea249786fb5f1aff4f66faf71e737397f2ebb342 /bin/repoman | |
| parent | ebfcfc636536a3d6fcaa0c0d8de27cac391b5b3c (diff) | |
| download | portage-da50b12d4c6eeca8dda1f97e49163c611c2b78b2.tar.gz portage-da50b12d4c6eeca8dda1f97e49163c611c2b78b2.tar.bz2 portage-da50b12d4c6eeca8dda1f97e49163c611c2b78b2.zip | |
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.
Diffstat (limited to 'bin/repoman')
| -rwxr-xr-x | bin/repoman | 8 |
1 files changed, 3 insertions, 5 deletions
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 |