From 2aa6700b25a6979826020aef087d6611a1aab40a Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Wed, 24 May 2017 09:09:17 +0200 Subject: [PATCH 1/3] bootstrap: Actually respect verbosity setting in config.toml --- src/bootstrap/bootstrap.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index bfba1a0dede24..871c101511e99 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -620,6 +620,11 @@ def bootstrap(): except: pass + if '\nverbose = 2' in rb.config_toml: + rb.verbose = 2 + elif '\nverbose = 1' in rb.config_toml: + rb.verbose = 1 + rb.use_vendored_sources = '\nvendor = true' in rb.config_toml or \ 'CFG_ENABLE_VENDOR' in rb.config_mk From 604f716dbe8f5aac191d4208cf53e31fd241011e Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Wed, 24 May 2017 09:10:15 +0200 Subject: [PATCH 2/3] bootstrap: Make bootstrap verbose if requested Fixes: #42099 --- src/bootstrap/bootstrap.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 871c101511e99..e3e1b08628846 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -385,6 +385,10 @@ def build_bootstrap(self): raise Exception("no cargo executable found at `%s`" % self.cargo()) args = [self.cargo(), "build", "--manifest-path", os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] + if self.verbose: + args.append("--verbose") + if self.verbose > 1: + args.append("--verbose") if self.use_locked_deps: args.append("--locked") if self.use_vendored_sources: From cd86a9ba4a727dff5e9139b925408bc500160168 Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Wed, 24 May 2017 09:11:10 +0200 Subject: [PATCH 3/3] bootstrap: Use common run() function to call cargo This brings verbosity even to invocation of cargo itself --- src/bootstrap/bootstrap.py | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index e3e1b08628846..0f85ba81d1268 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -127,13 +127,13 @@ def unpack(tarball, dst, verbose=False, match=None): shutil.move(tp, fp) shutil.rmtree(os.path.join(dst, fname)) -def run(args, verbose=False, exception=False, cwd=None): +def run(args, verbose=False, exception=False, cwd=None, env=None): if verbose: print("running: " + ' '.join(args)) sys.stdout.flush() # Use Popen here instead of call() as it apparently allows powershell on # Windows to not lock up waiting for input presumably. - ret = subprocess.Popen(args, cwd=cwd) + ret = subprocess.Popen(args, cwd=cwd, env=env) code = ret.wait() if code != 0: err = "failed to run: " + ' '.join(args) @@ -393,13 +393,7 @@ def build_bootstrap(self): args.append("--locked") if self.use_vendored_sources: args.append("--frozen") - self.run(args, env) - - def run(self, args, env=None, cwd=None): - proc = subprocess.Popen(args, env=env, cwd=cwd) - ret = proc.wait() - if ret != 0: - sys.exit(ret) + run(args, env=env, verbose=self.verbose) def output(self, args, env=None, cwd=None): default_encoding = sys.getdefaultencoding() @@ -571,7 +565,7 @@ def update_submodules(self): path = line[1:].split(' ')[1] submodules.append([path, line[0]]) - self.run(["git", "submodule", "sync"], cwd=self.rust_root) + run(["git", "submodule", "sync"], cwd=self.rust_root) for submod in submodules: path, status = submod @@ -584,15 +578,15 @@ def update_submodules(self): submod_path = os.path.join(self.rust_root, path) if status == ' ': - self.run(["git", "reset", "--hard"], cwd=submod_path) - self.run(["git", "clean", "-fdx"], cwd=submod_path) + run(["git", "reset", "--hard"], cwd=submod_path) + run(["git", "clean", "-fdx"], cwd=submod_path) elif status == '+': - self.run(["git", "submodule", "update", path], cwd=self.rust_root) - self.run(["git", "reset", "--hard"], cwd=submod_path) - self.run(["git", "clean", "-fdx"], cwd=submod_path) + run(["git", "submodule", "update", path], cwd=self.rust_root) + run(["git", "reset", "--hard"], cwd=submod_path) + run(["git", "clean", "-fdx"], cwd=submod_path) elif status == '-': - self.run(["git", "submodule", "init", path], cwd=self.rust_root) - self.run(["git", "submodule", "update", path], cwd=self.rust_root) + run(["git", "submodule", "init", path], cwd=self.rust_root) + run(["git", "submodule", "update", path], cwd=self.rust_root) else: raise ValueError('unknown submodule status: ' + status) @@ -685,7 +679,7 @@ def bootstrap(): env["BUILD"] = rb.build env["SRC"] = rb.rust_root env["BOOTSTRAP_PARENT_ID"] = str(os.getpid()) - rb.run(args, env) + run(args, env=env, verbose=rb.verbose) def main(): start_time = time()