diff options
| author | Conley Owens <cco3@android.com> | 2012-11-16 10:39:24 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-11-16 10:39:24 -0800 |
| commit | a67df63ef18f7bcd1398dc5c3622c01c3fcad15d (patch) | |
| tree | c456ef285ded2feb1eb0d9339f3f030f937658ef /project.py | |
| parent | f91074881fb437e8cba8f9be81bd63cda5e0a557 (diff) | |
| parent | 75ee0570da09abb1d2bbefe0d25f0560727e6b71 (diff) | |
| download | git-repo-a67df63ef18f7bcd1398dc5c3622c01c3fcad15d.tar.gz | |
Merge "Raise a NoManifestException when the manifest DNE"
Diffstat (limited to 'project.py')
| -rw-r--r-- | project.py | 6 |
1 files changed, 5 insertions, 1 deletions
| @@ -30,6 +30,7 @@ from git_command import GitCommand, git_require | |||
| 30 | from git_config import GitConfig, IsId, GetSchemeFromUrl, ID_RE | 30 | from git_config import GitConfig, IsId, GetSchemeFromUrl, ID_RE |
| 31 | from error import GitError, HookError, UploadError | 31 | from error import GitError, HookError, UploadError |
| 32 | from error import ManifestInvalidRevisionError | 32 | from error import ManifestInvalidRevisionError |
| 33 | from error import NoManifestException | ||
| 33 | from trace import IsTrace, Trace | 34 | from trace import IsTrace, Trace |
| 34 | 35 | ||
| 35 | from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M | 36 | from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M |
| @@ -1894,7 +1895,10 @@ class Project(object): | |||
| 1894 | path = os.path.join(self._project.gitdir, HEAD) | 1895 | path = os.path.join(self._project.gitdir, HEAD) |
| 1895 | else: | 1896 | else: |
| 1896 | path = os.path.join(self._project.worktree, '.git', HEAD) | 1897 | path = os.path.join(self._project.worktree, '.git', HEAD) |
| 1897 | fd = open(path, 'rb') | 1898 | try: |
| 1899 | fd = open(path, 'rb') | ||
| 1900 | except IOError: | ||
| 1901 | raise NoManifestException(path) | ||
| 1898 | try: | 1902 | try: |
| 1899 | line = fd.read() | 1903 | line = fd.read() |
| 1900 | finally: | 1904 | finally: |
