diff options
author | Conley Owens <cco3@android.com> | 2015-07-10 22:00:47 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-10 22:00:47 +0000 |
commit | bb4a1b5274240235812fe4d533a946b16d6e387e (patch) | |
tree | cef11406872fd7e341c712e4f61641bc5a1842dd | |
parent | c5ceeb16258d5d787845840036c57f9fdfdcad34 (diff) | |
parent | 87ea5913f2bd10351ae422985154e740e601669e (diff) | |
download | git-repo-bb4a1b5274240235812fe4d533a946b16d6e387e.tar.gz |
Merge "Improve error message when syncing a project with invalid groups."
-rwxr-xr-x | main.py | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -45,6 +45,7 @@ from command import MirrorSafeCommand | |||
45 | from subcmds.version import Version | 45 | from subcmds.version import Version |
46 | from editor import Editor | 46 | from editor import Editor |
47 | from error import DownloadError | 47 | from error import DownloadError |
48 | from error import InvalidProjectGroupsError | ||
48 | from error import ManifestInvalidRevisionError | 49 | from error import ManifestInvalidRevisionError |
49 | from error import ManifestParseError | 50 | from error import ManifestParseError |
50 | from error import NoManifestException | 51 | from error import NoManifestException |
@@ -173,6 +174,12 @@ class _Repo(object): | |||
173 | else: | 174 | else: |
174 | print('error: no project in current directory', file=sys.stderr) | 175 | print('error: no project in current directory', file=sys.stderr) |
175 | result = 1 | 176 | result = 1 |
177 | except InvalidProjectGroupsError as e: | ||
178 | if e.name: | ||
179 | print('error: project group must be enabled for project %s' % e.name, file=sys.stderr) | ||
180 | else: | ||
181 | print('error: project group must be enabled for the project in the current directory', file=sys.stderr) | ||
182 | result = 1 | ||
176 | finally: | 183 | finally: |
177 | elapsed = time.time() - start | 184 | elapsed = time.time() - start |
178 | hours, remainder = divmod(elapsed, 3600) | 185 | hours, remainder = divmod(elapsed, 3600) |