rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bootstrap: plumb verbosity into submodule ops

Browse Source 
Fix some lints while I'm here.
This commit is contained in:
Tamir Duberstein
2017-09-15 13:12:14 -04:00
parent 4a8933f4a7
commit e788fa7b6c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bootstrap/bootstrap.py
View File

@@ -625,7 +625,6 @@ class RustBuild(object):
def build_triple(self): def build_triple(self):
"""Build triple as in LLVM""" """Build triple as in LLVM"""
default_encoding = sys.getdefaultencoding()
config = self.get_toml('build') config = self.get_toml('build')
if config: if config:
return config return config
@@ -638,7 +637,7 @@ class RustBuild(object):
return return
print('Updating submodules') print('Updating submodules')
default_encoding = sys.getdefaultencoding() 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( submodules = [s.split(' ', 1)[1] for s in subprocess.check_output(
["git", "config", "--file", ["git", "config", "--file",
os.path.join(self.rust_root, ".gitmodules"), os.path.join(self.rust_root, ".gitmodules"),
@@ -683,7 +682,7 @@ def bootstrap():
try: try:
with open(args.config or 'config.toml') as config: with open(args.config or 'config.toml') as config:
build.config_toml = config.read() build.config_toml = config.read()
except: except OSError:
pass pass
if '\nverbose = 2' in build.config_toml: if '\nverbose = 2' in build.config_toml: