From 2ebaee0adc496323d472dc52eeb0fa5ded924796 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 27 Jul 2008 23:09:23 +0000 Subject: Fix the new glep56 code to handle missing metadata.xml. Thanks to jmbsvicetto for reporting. svn path=/main/trunk/; revision=11226 --- bin/repoman | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bin/repoman b/bin/repoman index 35807c658..c45622a00 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1061,6 +1061,8 @@ 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") @@ -1080,15 +1082,14 @@ 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) + #load USE flags from metadata.xml + try: + f = open(os.path.join(checkdir, "metadata.xml")) + utilities.parse_metadata_use(f, muselist) + f.close() + except (EnvironmentError, ParseError), e: + logging.exception("Couldn't read from metadata.xml: %s" % (e,)) + sys.exit(1) allmasked = True -- cgit v1.2.3-1-g7c22