diff options
Diffstat (limited to 'subcmds')
| -rw-r--r-- | subcmds/init.py | 1 | ||||
| -rw-r--r-- | subcmds/sync.py | 11 |
2 files changed, 5 insertions, 7 deletions
diff --git a/subcmds/init.py b/subcmds/init.py index 65b63efd..99f30dce 100644 --- a/subcmds/init.py +++ b/subcmds/init.py | |||
| @@ -25,7 +25,6 @@ from project import SyncBuffer | |||
| 25 | from git_config import GitConfig | 25 | from git_config import GitConfig |
| 26 | from git_command import git_require, MIN_GIT_VERSION_SOFT, MIN_GIT_VERSION_HARD | 26 | from git_command import git_require, MIN_GIT_VERSION_SOFT, MIN_GIT_VERSION_HARD |
| 27 | import fetch | 27 | import fetch |
| 28 | import git_superproject | ||
| 29 | import platform_utils | 28 | import platform_utils |
| 30 | from wrapper import Wrapper | 29 | from wrapper import Wrapper |
| 31 | 30 | ||
diff --git a/subcmds/sync.py b/subcmds/sync.py index 9e783205..4d0a5ec6 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
| @@ -304,12 +304,10 @@ later is required to fix a server side protocol bug. | |||
| 304 | Returns: | 304 | Returns: |
| 305 | Returns path to the overriding manifest file instead of None. | 305 | Returns path to the overriding manifest file instead of None. |
| 306 | """ | 306 | """ |
| 307 | superproject = self.manifest.superproject | ||
| 308 | superproject.SetQuiet(opt.quiet) | ||
| 307 | print_messages = git_superproject.PrintMessages(opt, self.manifest) | 309 | print_messages = git_superproject.PrintMessages(opt, self.manifest) |
| 308 | superproject = git_superproject.Superproject(self.manifest, | 310 | superproject.SetPrintMessages(print_messages) |
| 309 | self.repodir, | ||
| 310 | self.git_event_log, | ||
| 311 | quiet=opt.quiet, | ||
| 312 | print_messages=print_messages) | ||
| 313 | if opt.local_only: | 311 | if opt.local_only: |
| 314 | manifest_path = superproject.manifest_path | 312 | manifest_path = superproject.manifest_path |
| 315 | if manifest_path: | 313 | if manifest_path: |
| @@ -319,7 +317,8 @@ later is required to fix a server side protocol bug. | |||
| 319 | all_projects = self.GetProjects(args, | 317 | all_projects = self.GetProjects(args, |
| 320 | missing_ok=True, | 318 | missing_ok=True, |
| 321 | submodules_ok=opt.fetch_submodules) | 319 | submodules_ok=opt.fetch_submodules) |
| 322 | update_result = superproject.UpdateProjectsRevisionId(all_projects) | 320 | update_result = superproject.UpdateProjectsRevisionId( |
| 321 | all_projects, git_event_log=self.git_event_log) | ||
| 323 | manifest_path = update_result.manifest_path | 322 | manifest_path = update_result.manifest_path |
| 324 | superproject_logging_data['updatedrevisionid'] = bool(manifest_path) | 323 | superproject_logging_data['updatedrevisionid'] = bool(manifest_path) |
| 325 | if manifest_path: | 324 | if manifest_path: |
