summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2012-11-13 09:51:57 +0900
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2012-11-13 09:54:47 +0900
commit0b8df7be79d2b8b5d5a884fc2b0d070b42861459 (patch)
treebdc8e3ebbc9687ba75caea4df49915cc586ac085
parent717ece9d81ab428ff7358fb3d8a941f8371b626c (diff)
downloadgit-repo-0b8df7be79d2b8b5d5a884fc2b0d070b42861459.tar.gz
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
-rwxr-xr-xmain.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/main.py b/main.py
index 6236dd3d..5e575c56 100755
--- a/main.py
+++ b/main.py
@@ -49,6 +49,7 @@ from subcmds.version import Version
49from editor import Editor 49from editor import Editor
50from error import DownloadError 50from error import DownloadError
51from error import ManifestInvalidRevisionError 51from error import ManifestInvalidRevisionError
52from error import ManifestParseError
52from error import NoSuchProjectError 53from error import NoSuchProjectError
53from error import RepoChangedException 54from error import RepoChangedException
54from manifest_xml import XmlManifest 55from manifest_xml import XmlManifest
@@ -397,6 +398,9 @@ def _Main(argv):
397 close_ssh() 398 close_ssh()
398 except KeyboardInterrupt: 399 except KeyboardInterrupt:
399 result = 1 400 result = 1
401 except ManifestParseError as mpe:
402 print >>sys.stderr, 'fatal: %s' % mpe
403 result = 1
400 except RepoChangedException as rce: 404 except RepoChangedException as rce:
401 # If repo changed, re-exec ourselves. 405 # If repo changed, re-exec ourselves.
402 # 406 #