Merge "Handle manifest parse errors in main"

This commit is contained in:
Conley Owens 2012-11-12 17:35:40 -08:00 committed by Gerrit Code Review
commit 4a4776e9ab

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.
# #