diff options
Diffstat (limited to 'subcmds/sync.py')
-rw-r--r-- | subcmds/sync.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py index b34787d2..2d2c8bff 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
@@ -526,6 +526,7 @@ later is required to fix a server side protocol bug. | |||
526 | (username, password), | 526 | (username, password), |
527 | 1) | 527 | 1) |
528 | 528 | ||
529 | manifest_name = opt.manifest_name | ||
529 | try: | 530 | try: |
530 | server = xmlrpc.client.Server(manifest_server) | 531 | server = xmlrpc.client.Server(manifest_server) |
531 | if opt.smart_sync: | 532 | if opt.smart_sync: |
@@ -560,7 +561,7 @@ later is required to fix a server side protocol bug. | |||
560 | print('error: cannot write manifest to %s' % manifest_path, | 561 | print('error: cannot write manifest to %s' % manifest_path, |
561 | file=sys.stderr) | 562 | file=sys.stderr) |
562 | sys.exit(1) | 563 | sys.exit(1) |
563 | self.manifest.Override(manifest_name) | 564 | self._ReloadManifest(manifest_name) |
564 | else: | 565 | else: |
565 | print('error: %s' % manifest_str, file=sys.stderr) | 566 | print('error: %s' % manifest_str, file=sys.stderr) |
566 | sys.exit(1) | 567 | sys.exit(1) |
@@ -593,7 +594,7 @@ later is required to fix a server side protocol bug. | |||
593 | mp.Sync_LocalHalf(syncbuf) | 594 | mp.Sync_LocalHalf(syncbuf) |
594 | if not syncbuf.Finish(): | 595 | if not syncbuf.Finish(): |
595 | sys.exit(1) | 596 | sys.exit(1) |
596 | self._ReloadManifest(opt.manifest_name) | 597 | self._ReloadManifest(manifest_name) |
597 | if opt.jobs is None: | 598 | if opt.jobs is None: |
598 | self.jobs = self.manifest.default.sync_j | 599 | self.jobs = self.manifest.default.sync_j |
599 | all_projects = self.GetProjects(args, | 600 | all_projects = self.GetProjects(args, |
@@ -618,7 +619,7 @@ later is required to fix a server side protocol bug. | |||
618 | # Iteratively fetch missing and/or nested unregistered submodules | 619 | # Iteratively fetch missing and/or nested unregistered submodules |
619 | previously_missing_set = set() | 620 | previously_missing_set = set() |
620 | while True: | 621 | while True: |
621 | self._ReloadManifest(opt.manifest_name) | 622 | self._ReloadManifest(manifest_name) |
622 | all_projects = self.GetProjects(args, | 623 | all_projects = self.GetProjects(args, |
623 | missing_ok=True, | 624 | missing_ok=True, |
624 | submodules_ok=opt.fetch_submodules) | 625 | submodules_ok=opt.fetch_submodules) |