Skip to content

Commit

Permalink
bootstrap: plumb verbosity into submodule ops
Browse files Browse the repository at this point in the history
Fix some lints while I'm here.
  • Loading branch information
tamird committed Sep 17, 2017
1 parent 4a8933f commit e788fa7
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"),
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit e788fa7

Please sign in to comment.