diff options
Diffstat (limited to 'subcmds')
| -rw-r--r-- | subcmds/init.py | 13 | ||||
| -rw-r--r-- | subcmds/sync.py | 3 |
2 files changed, 11 insertions, 5 deletions
diff --git a/subcmds/init.py b/subcmds/init.py index fc446045..c2376b65 100644 --- a/subcmds/init.py +++ b/subcmds/init.py | |||
| @@ -185,10 +185,15 @@ to update the working directory files. | |||
| 185 | return {'REPO_MANIFEST_URL': 'manifest_url', | 185 | return {'REPO_MANIFEST_URL': 'manifest_url', |
| 186 | 'REPO_MIRROR_LOCATION': 'reference'} | 186 | 'REPO_MIRROR_LOCATION': 'reference'} |
| 187 | 187 | ||
| 188 | def _CloneSuperproject(self): | 188 | def _CloneSuperproject(self, opt): |
| 189 | """Clone the superproject based on the superproject's url and branch.""" | 189 | """Clone the superproject based on the superproject's url and branch. |
| 190 | |||
| 191 | Args: | ||
| 192 | opt: Program options returned from optparse. See _Options(). | ||
| 193 | """ | ||
| 190 | superproject = git_superproject.Superproject(self.manifest, | 194 | superproject = git_superproject.Superproject(self.manifest, |
| 191 | self.repodir) | 195 | self.repodir, |
| 196 | quiet=opt.quiet) | ||
| 192 | if not superproject.Sync(): | 197 | if not superproject.Sync(): |
| 193 | print('error: git update of superproject failed', file=sys.stderr) | 198 | print('error: git update of superproject failed', file=sys.stderr) |
| 194 | sys.exit(1) | 199 | sys.exit(1) |
| @@ -553,7 +558,7 @@ to update the working directory files. | |||
| 553 | self._LinkManifest(opt.manifest_name) | 558 | self._LinkManifest(opt.manifest_name) |
| 554 | 559 | ||
| 555 | if self.manifest.manifestProject.config.GetBoolean('repo.superproject'): | 560 | if self.manifest.manifestProject.config.GetBoolean('repo.superproject'): |
| 556 | self._CloneSuperproject() | 561 | self._CloneSuperproject(opt) |
| 557 | 562 | ||
| 558 | if os.isatty(0) and os.isatty(1) and not self.manifest.IsMirror: | 563 | if os.isatty(0) and os.isatty(1) and not self.manifest.IsMirror: |
| 559 | if opt.config_name or self._ShouldConfigureUser(opt): | 564 | if opt.config_name or self._ShouldConfigureUser(opt): |
diff --git a/subcmds/sync.py b/subcmds/sync.py index 0db96b54..3ad0627d 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
| @@ -292,7 +292,8 @@ later is required to fix a server side protocol bug. | |||
| 292 | Returns path to the overriding manifest file. | 292 | Returns path to the overriding manifest file. |
| 293 | """ | 293 | """ |
| 294 | superproject = git_superproject.Superproject(self.manifest, | 294 | superproject = git_superproject.Superproject(self.manifest, |
| 295 | self.repodir) | 295 | self.repodir, |
| 296 | quiet=opt.quiet) | ||
| 296 | all_projects = self.GetProjects(args, | 297 | all_projects = self.GetProjects(args, |
| 297 | missing_ok=True, | 298 | missing_ok=True, |
| 298 | submodules_ok=opt.fetch_submodules) | 299 | submodules_ok=opt.fetch_submodules) |
