Handle manifest parse errors in main

Add handling of manifest parse errors in the main method, and
print an error.  This will prevent python tracebacks being
dumped in many cases.

Change-Id: I75e73539afa34049f73c993dbfda203f1ad33b45
This commit is contained in:
David Pursehouse 2012-11-13 09:51:57 +09:00
parent 717ece9d81
commit 0b8df7be79

View File

@ -49,6 +49,7 @@ from subcmds.version import Version
from editor import Editor from editor import Editor
from error import DownloadError from error import DownloadError
from error import ManifestInvalidRevisionError from error import ManifestInvalidRevisionError
from error import ManifestParseError
from error import NoSuchProjectError from error import NoSuchProjectError
from error import RepoChangedException from error import RepoChangedException
from manifest_xml import XmlManifest from manifest_xml import XmlManifest
@ -397,6 +398,9 @@ def _Main(argv):
close_ssh() close_ssh()
except KeyboardInterrupt: except KeyboardInterrupt:
result = 1 result = 1
except ManifestParseError as mpe:
print >>sys.stderr, 'fatal: %s' % mpe
result = 1
except RepoChangedException as rce: except RepoChangedException as rce:
# If repo changed, re-exec ourselves. # If repo changed, re-exec ourselves.
# #