diff options
| author | Tamir Duberstein <tamird@gmail.com> | 2017-09-15 13:12:14 -0400 |
|---|---|---|
| committer | Tamir Duberstein <tamird@gmail.com> | 2017-09-17 13:15:06 -0400 |
| commit | e788fa7b6cf07860eb0ff3e90ff32fc4f9d26cae (patch) | |
| tree | 700445b72590dcf429fd953852ba2836698bdf7b /src/bootstrap | |
| parent | 4a8933f4a704a0ffb7e01dacbed61ae571e5908e (diff) | |
| download | rust-e788fa7b6cf07860eb0ff3e90ff32fc4f9d26cae.tar.gz rust-e788fa7b6cf07860eb0ff3e90ff32fc4f9d26cae.zip | |
bootstrap: plumb verbosity into submodule ops
Fix some lints while I'm here.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 4ef6d70e820..f12da29c45b 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -625,7 +625,6 @@ class RustBuild(object): def build_triple(self): """Build triple as in LLVM""" - default_encoding = sys.getdefaultencoding() config = self.get_toml('build') if config: return config @@ -638,7 +637,7 @@ class RustBuild(object): return print('Updating submodules') default_encoding = sys.getdefaultencoding() - run(["git", "submodule", "-q", "sync"], cwd=self.rust_root) + run(["git", "submodule", "-q", "sync"], cwd=self.rust_root, verbose=self.verbose) submodules = [s.split(' ', 1)[1] for s in subprocess.check_output( ["git", "config", "--file", os.path.join(self.rust_root, ".gitmodules"), @@ -683,7 +682,7 @@ def bootstrap(): try: with open(args.config or 'config.toml') as config: build.config_toml = config.read() - except: + except OSError: pass if '\nverbose = 2' in build.config_toml: |