android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle XML errors when parsing the manifest

Browse Source 
Catch ExpatError and exit gracefully with an error message, rather
than exiting with a python traceback.

Change-Id: Ifd0a7762aab4e8de63dab8a66117170a05586866
This commit is contained in:
David Pursehouse 2012-11-13 04:00:28 +09:00
parent 1ad7b555df
commit f7fc8a95be
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest_xml.py
View File

@ -310,7 +310,11 @@ class XmlManifest(object):
self._loaded = True self._loaded = True
def _ParseManifestXml(self, path, include_root): def _ParseManifestXml(self, path, include_root):
try:
root = xml.dom.minidom.parse(path) root = xml.dom.minidom.parse(path)
except (OSError, xml.parsers.expat.ExpatError), e:
raise ManifestParseError("error parsing manifest %s: %s" % (path, e))
if not root or not root.childNodes: if not root or not root.childNodes:
raise ManifestParseError("no root node in %s" % (path,)) raise ManifestParseError("no root node in %s" % (path,))