From 39c89b95ba4843fd746a23717638f6ede8fb86ad Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 18 Jul 2008 12:40:58 +0000 Subject: Bug #199788 - Make repoman parse GLEP 56 USE flag descriptions from metadata.xml (in addition to use.local.desc). Thanks to Doug Goldstein for this patch. svn path=/main/trunk/; revision=11126 --- bin/repoman | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'bin') diff --git a/bin/repoman b/bin/repoman index 2c34ac919..e53ae076a 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1072,6 +1072,16 @@ for x in scanlist: stats["metadata.bad"]+=1 fails["metadata.bad"].append(x+"/metadata.xml") + #load USE flags from metadata.xml + muselist=[] + try: + f = open(os.path.join(checkdir, "metadata.xml")) + utilities.parse_metadata_use(f, muselist) + f.close() + except (IOError, OSError, ParseError), e: + logging.exception("Couldn't read from metadata.xml", e) + sys.exit(1) + allmasked = True for y in ebuildlist: @@ -1354,6 +1364,11 @@ for x in scanlist: if flag_name not in uselist: myuse.append(flag_name) + # uselist checks - metadata + for mypos in range(len(myuse)-1,-1,-1): + if myuse[mypos] and (myuse[mypos] in muselist): + del myuse[mypos] + # uselist checks - local mykey = portage.dep_getkey(catpkg) if mykey in luselist: -- cgit v1.2.3-1-g7c22