summaryrefslogtreecommitdiffstats
path: root/subcmds/sync.py
diff options
context:
space:
mode:
Diffstat (limited to 'subcmds/sync.py')
-rw-r--r--subcmds/sync.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py
index ed656b8c..2a0de0a9 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -298,10 +298,12 @@ later is required to fix a server side protocol bug.
298 Returns: 298 Returns:
299 Returns path to the overriding manifest file instead of None. 299 Returns path to the overriding manifest file instead of None.
300 """ 300 """
301 print_messages = git_superproject.PrintMessages(opt, self.manifest)
301 superproject = git_superproject.Superproject(self.manifest, 302 superproject = git_superproject.Superproject(self.manifest,
302 self.repodir, 303 self.repodir,
303 self.git_event_log, 304 self.git_event_log,
304 quiet=opt.quiet) 305 quiet=opt.quiet,
306 print_messages=print_messages)
305 if opt.local_only: 307 if opt.local_only:
306 manifest_path = superproject.manifest_path 308 manifest_path = superproject.manifest_path
307 if manifest_path: 309 if manifest_path:
@@ -317,10 +319,11 @@ later is required to fix a server side protocol bug.
317 if manifest_path: 319 if manifest_path:
318 self._ReloadManifest(manifest_path, load_local_manifests) 320 self._ReloadManifest(manifest_path, load_local_manifests)
319 else: 321 else:
320 print('warning: Update of revisionId from superproject has failed, ' 322 if print_messages:
321 'repo sync will not use superproject to fetch the source. ', 323 print('warning: Update of revisionId from superproject has failed, '
322 'Please resync with the --no-use-superproject option to avoid this repo warning.', 324 'repo sync will not use superproject to fetch the source. ',
323 file=sys.stderr) 325 'Please resync with the --no-use-superproject option to avoid this repo warning.',
326 file=sys.stderr)
324 if update_result.fatal and opt.use_superproject is not None: 327 if update_result.fatal and opt.use_superproject is not None:
325 sys.exit(1) 328 sys.exit(1)
326 return manifest_path 329 return manifest_path
@@ -970,6 +973,7 @@ later is required to fix a server side protocol bug.
970 superproject_logging_data = { 973 superproject_logging_data = {
971 'superproject': use_superproject, 974 'superproject': use_superproject,
972 'haslocalmanifests': bool(self.manifest.HasLocalManifests), 975 'haslocalmanifests': bool(self.manifest.HasLocalManifests),
976 'hassuperprojecttag': bool(self.manifest.superproject),
973 } 977 }
974 if use_superproject: 978 if use_superproject:
975 manifest_name = self._UpdateProjectsRevisionId( 979 manifest_name = self._UpdateProjectsRevisionId(