bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Detect git version before attempting to use --progress

Browse source 
Otherwise each update is run twice and errors are printed
This commit is contained in:
Dillon Amburgey 2020-04-25 15:43:19 -04:00
parent 659951c4a0
commit 7ac093fda9
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/bootstrap/bootstrap.py
View file

@ -2,6 +2,7 @@ from __future__ import absolute_import, division, print_function
import argparse import argparse
import contextlib import contextlib
import datetime import datetime
import distutils.version
import hashlib import hashlib
import os import os
import re import re
@ -331,6 +332,7 @@ class RustBuild(object):
self.use_locked_deps = '' self.use_locked_deps = ''
self.use_vendored_sources = '' self.use_vendored_sources = ''
self.verbose = False self.verbose = False
self.git_version = None
def download_stage0(self): def download_stage0(self):
"""Fetch the build system for Rust, written in Rust """Fetch the build system for Rust, written in Rust
@ -743,15 +745,13 @@ class RustBuild(object):
run(["git", "submodule", "-q", "sync", module], run(["git", "submodule", "-q", "sync", module],
cwd=self.rust_root, verbose=self.verbose) cwd=self.rust_root, verbose=self.verbose)
try:
run(["git", "submodule", "update", update_args = ["git", "submodule", "update", "--init", "--recursive"]
"--init", "--recursive", "--progress", module], if self.git_version >= distutils.version.LooseVersion("2.11.0"):
cwd=self.rust_root, verbose=self.verbose, exception=True) update_args.append("--progress")
except RuntimeError: update_args.append(module)
# Some versions of git don't support --progress. run(update_args, cwd=self.rust_root, verbose=self.verbose, exception=True)
run(["git", "submodule", "update",
"--init", "--recursive", module],
cwd=self.rust_root, verbose=self.verbose)
run(["git", "reset", "-q", "--hard"], run(["git", "reset", "-q", "--hard"],
cwd=module_path, verbose=self.verbose) cwd=module_path, verbose=self.verbose)
run(["git", "clean", "-qdfx"], run(["git", "clean", "-qdfx"],
@ -763,9 +763,13 @@ class RustBuild(object):
self.get_toml('submodules') == "false": self.get_toml('submodules') == "false":
return return
# check the existence of 'git' command default_encoding = sys.getdefaultencoding()
# check the existence and version of 'git' command
try: try:
subprocess.check_output(['git', '--version']) git_version_output = subprocess.check_output(['git', '--version'])
git_version_str = git_version_output.strip().split()[2].decode(default_encoding)
self.git_version = distutils.version.LooseVersion(git_version_str)
except (subprocess.CalledProcessError, OSError): except (subprocess.CalledProcessError, OSError):
print("error: `git` is not found, please make sure it's installed and in the path.") print("error: `git` is not found, please make sure it's installed and in the path.")
sys.exit(1) sys.exit(1)