Skip to content

Commit

Permalink
Revert "sync: skip network half on repo upgrade"
Browse files Browse the repository at this point in the history
This reverts commit 61224d0.

Reason for revert: the manifest will be updated during in the
post-upgrade process, and that can result in a missing object in
LocalHalf, since NetworkHalf is not skipped.

Bug: b/392979411
Change-Id: I8a46e5b54093ed78285c8b30f000bb08a8244179
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/450181
Tested-by: Josip Sokcevic <[email protected]>
Commit-Queue: Josip Sokcevic <[email protected]>
Reviewed-by: Scott Lee <[email protected]>
  • Loading branch information
sokcevicG authored and LUCI committed Jan 31, 2025
1 parent dfdf577 commit 5ae8292
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion subcmds/sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -1834,7 +1834,7 @@ def _ExecuteHelper(self, opt, args, errors):

self._fetch_times = _FetchTimes(manifest)
self._local_sync_state = LocalSyncState(manifest)
if not opt.local_only and not opt.repo_upgraded:
if not opt.local_only:
with multiprocessing.Manager() as manager:
with ssh.ProxyManager(manager) as ssh_proxy:
# Initialize the socket dir once in the parent.
Expand Down

0 comments on commit 5ae8292

Please sign in to comment.