Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 475588 Details for
Bug 617744
dev-lang/rust-1.18.0, dev-util/cargo-0.19.0 - version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
rust-1.17.0-bootstrap-verbose.patch
rust-1.17.0-bootstrap-verbose.patch (text/plain), 3.71 KB, created by
Dennis Schridde
on 2017-06-08 07:05:09 UTC
(
hide
)
Description:
rust-1.17.0-bootstrap-verbose.patch
Filename:
MIME Type:
Creator:
Dennis Schridde
Created:
2017-06-08 07:05:09 UTC
Size:
3.71 KB
patch
obsolete
>From 21484c8799606b8b7eb8645372cf076758d44f02 Mon Sep 17 00:00:00 2001 >From: Dennis Schridde <devurandom@gmx.net> >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 b326f95e50..cc9e7e5df0 100644 >--- a/src/bootstrap/bootstrap.py >+++ b/src/bootstrap/bootstrap.py >@@ -545,6 +545,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 > >-- >2.13.0 > >From 36b628f813d3e75b81916358b0aee6f74ffc4dba Mon Sep 17 00:00:00 2001 >From: Dennis Schridde <devurandom@gmx.net> >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 cc9e7e5df0..2e55bfcf4f 100644 >--- a/src/bootstrap/bootstrap.py >+++ b/src/bootstrap/bootstrap.py >@@ -370,6 +370,10 @@ class RustBuild(object): > 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: >-- >2.13.0 > >From 8689e8431ff290a9ce204b84ffb7296793fbed30 Mon Sep 17 00:00:00 2001 >From: Dennis Schridde <devurandom@gmx.net> >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 | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) > >diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py >index 2e55bfcf4f..463f3fa031 100644 >--- a/src/bootstrap/bootstrap.py >+++ b/src/bootstrap/bootstrap.py >@@ -126,13 +126,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): >+def run(args, verbose=False, exception=False, 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) >+ ret = subprocess.Popen(args, env=env) > code = ret.wait() > if code != 0: > err = "failed to run: " + ' '.join(args) >@@ -378,13 +378,7 @@ class RustBuild(object): > args.append("--locked") > if self.use_vendored_sources: > args.append("--frozen") >- self.run(args, env) >- >- def run(self, args, env): >- proc = subprocess.Popen(args, env=env) >- ret = proc.wait() >- if ret != 0: >- sys.exit(ret) >+ run(args, env=env, verbose=self.verbose) > > def build_triple(self): > default_encoding = sys.getdefaultencoding() >@@ -603,7 +597,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() >-- >2.13.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 617744
:
475276
|
475278
|
475280
|
475588
|
475590
|
476730
|
476742
|
476744
|
476746
|
476748
|
477190
|
477200
|
477202
|
477204
|
477206
|
477632
|
493740
|
506794