Skip to content

Commit 86af231

Browse files
ZequanWucopybara-github
authored andcommitted
Revert "Disable color when running x.py"
This reverts commit bc97df3bc793e73c8f658033209e0e78613b62c9. Reason for revert: Causing *upload_rust bots to fail: "error: the argument '--color <WHEN>' cannot be used multiple times" Original change's description: > Disable color when running x.py > > By default, color output is enabled. Logging from build bots has "[1m[32m" at the output, which makes it harder to read. > > Change-Id: Idb0d30c86c77ffb1cc1a7b15288c9f96bd621b8e > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5665607 > Auto-Submit: Zequan Wu <zequanwu@google.com> > Reviewed-by: Arthur Eubanks <aeubanks@google.com> > Commit-Queue: Zequan Wu <zequanwu@google.com> > Cr-Commit-Position: refs/heads/main@{#1321915} Change-Id: I55a4e950f2324b7dc26c6b70b44cd5843a6e28ed No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5672444 Auto-Submit: Zequan Wu <zequanwu@google.com> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Cr-Commit-Position: refs/heads/main@{#1322280} NOKEYCHECK=True GitOrigin-RevId: 2b574cda4f5ab7be03aac0acce2b5c167a6cc23d
1 parent 964b5db commit 86af231

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

build_rust.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,10 +452,10 @@ def quote_string(s: str):
452452
def run(self, sub, args):
453453
''' Run x.py subcommand with specified args. '''
454454
os.chdir(RUST_SRC_DIR)
455-
cmd = [sys.executable, 'x.py', sub] + args + ['--color', 'never']
455+
cmd = [sys.executable, 'x.py', sub]
456456
if self._verbose and self._verbose > 0:
457457
cmd.append('-' + self._verbose * 'v')
458-
RunCommand(cmd, setenv=True, env=self._env)
458+
RunCommand(cmd + args, setenv=True, env=self._env)
459459
os.chdir(CHROMIUM_DIR)
460460

461461
def get_env(self):

0 commit comments

Comments
 (0)