diff options
-rw-r--r-- | manifest.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/manifest.py b/manifest.py index ffff14a5..3d5e092c 100644 --- a/manifest.py +++ b/manifest.py | |||
@@ -45,16 +45,9 @@ class Manifest(object): | |||
45 | gitdir = os.path.join(repodir, 'repo/.git'), | 45 | gitdir = os.path.join(repodir, 'repo/.git'), |
46 | worktree = os.path.join(repodir, 'repo')) | 46 | worktree = os.path.join(repodir, 'repo')) |
47 | 47 | ||
48 | wt = os.path.join(repodir, 'manifests') | ||
49 | gd_new = os.path.join(repodir, 'manifests.git') | ||
50 | gd_old = os.path.join(wt, '.git') | ||
51 | if os.path.exists(gd_new) or not os.path.exists(gd_old): | ||
52 | gd = gd_new | ||
53 | else: | ||
54 | gd = gd_old | ||
55 | self.manifestProject = MetaProject(self, 'manifests', | 48 | self.manifestProject = MetaProject(self, 'manifests', |
56 | gitdir = gd, | 49 | gitdir = os.path.join(repodir, 'manifests.git'), |
57 | worktree = wt) | 50 | worktree = os.path.join(repodir, 'manifests')) |
58 | 51 | ||
59 | self._Unload() | 52 | self._Unload() |
60 | 53 | ||