bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #60379 - froydnj:bootstrap-progress-fixes, r=kennytm

Browse source 
intelligently handle older version of git in bootstrap

If we fail to run with `--progress`, try running without instead.

Fixes #57080.
This commit is contained in:
bors 2019-05-02 13:26:52 +00:00
commit d15fc17381
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/bootstrap/bootstrap.py
View file

@ -677,9 +677,15 @@ 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)
run(["git", "submodule", "update", try:
"--init", "--recursive", "--progress", module], run(["git", "submodule", "update",
cwd=self.rust_root, verbose=self.verbose) "--init", "--recursive", "--progress", module],
cwd=self.rust_root, verbose=self.verbose, exception=True)
except RuntimeError:
# Some versions of git don't support --progress.
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"],