diff options
Diffstat (limited to 'subcmds/sync.py')
-rw-r--r-- | subcmds/sync.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py index 68ad88d5..13c419c3 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
@@ -396,8 +396,8 @@ later is required to fix a server side protocol bug. | |||
396 | err_event=err_event, | 396 | err_event=err_event, |
397 | clone_filter=self.manifest.CloneFilter) | 397 | clone_filter=self.manifest.CloneFilter) |
398 | if self.jobs > 1: | 398 | if self.jobs > 1: |
399 | t = _threading.Thread(target = self._FetchProjectList, | 399 | t = _threading.Thread(target=self._FetchProjectList, |
400 | kwargs = kwargs) | 400 | kwargs=kwargs) |
401 | # Ensure that Ctrl-C will not freeze the repo process. | 401 | # Ensure that Ctrl-C will not freeze the repo process. |
402 | t.daemon = True | 402 | t.daemon = True |
403 | threads.add(t) | 403 | threads.add(t) |
@@ -704,16 +704,16 @@ later is required to fix a server side protocol bug. | |||
704 | gitdir = os.path.join(self.manifest.topdir, path, '.git') | 704 | gitdir = os.path.join(self.manifest.topdir, path, '.git') |
705 | if os.path.exists(gitdir): | 705 | if os.path.exists(gitdir): |
706 | project = Project( | 706 | project = Project( |
707 | manifest = self.manifest, | 707 | manifest=self.manifest, |
708 | name = path, | 708 | name=path, |
709 | remote = RemoteSpec('origin'), | 709 | remote=RemoteSpec('origin'), |
710 | gitdir = gitdir, | 710 | gitdir=gitdir, |
711 | objdir = gitdir, | 711 | objdir=gitdir, |
712 | worktree = os.path.join(self.manifest.topdir, path), | 712 | worktree=os.path.join(self.manifest.topdir, path), |
713 | relpath = path, | 713 | relpath=path, |
714 | revisionExpr = 'HEAD', | 714 | revisionExpr='HEAD', |
715 | revisionId = None, | 715 | revisionId=None, |
716 | groups = None) | 716 | groups=None) |
717 | 717 | ||
718 | if project.IsDirty() and opt.force_remove_dirty: | 718 | if project.IsDirty() and opt.force_remove_dirty: |
719 | print('WARNING: Removing dirty project "%s": uncommitted changes ' | 719 | print('WARNING: Removing dirty project "%s": uncommitted changes ' |
@@ -1100,9 +1100,9 @@ def _VerifyTag(project): | |||
1100 | 1100 | ||
1101 | cmd = [GIT, 'tag', '-v', cur] | 1101 | cmd = [GIT, 'tag', '-v', cur] |
1102 | proc = subprocess.Popen(cmd, | 1102 | proc = subprocess.Popen(cmd, |
1103 | stdout = subprocess.PIPE, | 1103 | stdout=subprocess.PIPE, |
1104 | stderr = subprocess.PIPE, | 1104 | stderr=subprocess.PIPE, |
1105 | env = env) | 1105 | env=env) |
1106 | out = proc.stdout.read() | 1106 | out = proc.stdout.read() |
1107 | proc.stdout.close() | 1107 | proc.stdout.close() |
1108 | 1108 | ||