diff options
Diffstat (limited to 'subcmds/sync.py')
| -rw-r--r-- | subcmds/sync.py | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py index 5020ea7a..eda95f96 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
| @@ -294,28 +294,12 @@ later is required to fix a server side protocol bug. | |||
| 294 | Returns: | 294 | Returns: |
| 295 | Returns path to the overriding manifest file. | 295 | Returns path to the overriding manifest file. |
| 296 | """ | 296 | """ |
| 297 | if not self.manifest.superproject: | 297 | superproject = git_superproject.Superproject(self.manifest, |
| 298 | print('error: superproject tag is not defined in manifest.xml', | 298 | self.repodir) |
| 299 | file=sys.stderr) | ||
| 300 | sys.exit(1) | ||
| 301 | print('WARNING: --use-superproject is experimental and not ' | ||
| 302 | 'for general use', file=sys.stderr) | ||
| 303 | |||
| 304 | superproject_url = self.manifest.superproject['remote'].url | ||
| 305 | if not superproject_url: | ||
| 306 | print('error: superproject URL is not defined in manifest.xml', | ||
| 307 | file=sys.stderr) | ||
| 308 | sys.exit(1) | ||
| 309 | |||
| 310 | superproject = git_superproject.Superproject(self.manifest.repodir) | ||
| 311 | all_projects = self.GetProjects(args, | 299 | all_projects = self.GetProjects(args, |
| 312 | missing_ok=True, | 300 | missing_ok=True, |
| 313 | submodules_ok=opt.fetch_submodules) | 301 | submodules_ok=opt.fetch_submodules) |
| 314 | branch = self._GetBranch() | 302 | manifest_path = superproject.UpdateProjectsRevisionId(all_projects) |
| 315 | manifest_path = superproject.UpdateProjectsRevisionId(self.manifest, | ||
| 316 | all_projects, | ||
| 317 | url=superproject_url, | ||
| 318 | branch=branch) | ||
| 319 | if not manifest_path: | 303 | if not manifest_path: |
| 320 | print('error: Update of revsionId from superproject has failed', | 304 | print('error: Update of revsionId from superproject has failed', |
| 321 | file=sys.stderr) | 305 | file=sys.stderr) |
