From e788fa7b6cf07860eb0ff3e90ff32fc4f9d26cae Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Fri, 15 Sep 2017 13:12:14 -0400 Subject: [PATCH] bootstrap: plumb verbosity into submodule ops Fix some lints while I'm here. --- src/bootstrap/bootstrap.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 4ef6d70e820ea..f12da29c45b02 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -625,7 +625,6 @@ def build_bootstrap(self): 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 @@ def update_submodules(self): 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: