summaryrefslogtreecommitdiffstats
path: root/subcmds/sync.py
diff options
context:
space:
mode:
Diffstat (limited to 'subcmds/sync.py')
-rw-r--r--subcmds/sync.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 82c065e2..ed2e516a 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -1092,10 +1092,10 @@ later is required to fix a server side protocol bug.
1092 force_sync=force_sync, 1092 force_sync=force_sync,
1093 force_checkout=force_checkout, 1093 force_checkout=force_checkout,
1094 force_rebase=force_rebase, 1094 force_rebase=force_rebase,
1095 errors=errors,
1096 verbose=verbose, 1095 verbose=verbose,
1097 ) 1096 )
1098 success = syncbuf.Finish() 1097 success = syncbuf.Finish()
1098 errors.extend(syncbuf.errors)
1099 except KeyboardInterrupt: 1099 except KeyboardInterrupt:
1100 logger.error("Keyboard interrupt while processing %s", project.name) 1100 logger.error("Keyboard interrupt while processing %s", project.name)
1101 except GitError as e: 1101 except GitError as e:
@@ -1753,10 +1753,10 @@ later is required to fix a server side protocol bug.
1753 mp.Sync_LocalHalf( 1753 mp.Sync_LocalHalf(
1754 syncbuf, 1754 syncbuf,
1755 submodules=mp.manifest.HasSubmodules, 1755 submodules=mp.manifest.HasSubmodules,
1756 errors=errors,
1757 verbose=opt.verbose, 1756 verbose=opt.verbose,
1758 ) 1757 )
1759 clean = syncbuf.Finish() 1758 clean = syncbuf.Finish()
1759 errors.extend(syncbuf.errors)
1760 self.event_log.AddSync( 1760 self.event_log.AddSync(
1761 mp, event_log.TASK_SYNC_LOCAL, start, time.time(), clean 1761 mp, event_log.TASK_SYNC_LOCAL, start, time.time(), clean
1762 ) 1762 )
@@ -2284,19 +2284,17 @@ later is required to fix a server side protocol bug.
2284 project.manifest.manifestProject.config, 2284 project.manifest.manifestProject.config,
2285 detach_head=opt.detach_head, 2285 detach_head=opt.detach_head,
2286 ) 2286 )
2287 local_half_errors = []
2288 project.Sync_LocalHalf( 2287 project.Sync_LocalHalf(
2289 syncbuf, 2288 syncbuf,
2290 force_sync=opt.force_sync, 2289 force_sync=opt.force_sync,
2291 force_checkout=opt.force_checkout, 2290 force_checkout=opt.force_checkout,
2292 force_rebase=opt.rebase, 2291 force_rebase=opt.rebase,
2293 errors=local_half_errors,
2294 verbose=opt.verbose, 2292 verbose=opt.verbose,
2295 ) 2293 )
2296 checkout_success = syncbuf.Finish() 2294 checkout_success = syncbuf.Finish()
2297 if local_half_errors: 2295 if syncbuf.errors:
2298 checkout_error = SyncError( 2296 checkout_error = SyncError(
2299 aggregate_errors=local_half_errors 2297 aggregate_errors=syncbuf.errors
2300 ) 2298 )
2301 except KeyboardInterrupt: 2299 except KeyboardInterrupt:
2302 logger.error( 2300 logger.error(