build/build.py - Issue 1500123003: Fix 'cipd - build packages' step for internal waterfall.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/build.py

Issue 1500123003: Fix 'cipd - build packages' step for internal waterfall. (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master

Patch Set: Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/build.py

diff --git a/build/build.py b/build/build.py

index 2a77c847fb51a6bdda37c1ddb54909694ccf0050..c399ce8d88368eee8f315c9e2c18d3bbd190de6b 100755

--- a/build/build.py

+++ b/build/build.py

@@ -178,11 +178,14 @@ def read_yaml(py_venv, path):

else:

python_venv_path = ('bin', 'python')

executable = os.path.join(py_venv, *python_venv_path)

+ env = os.environ.copy()

+ env.pop('PYTHONPATH', None)

proc = subprocess.Popen(

[executable, '-c', oneliner],

executable=executable,

stdin=subprocess.PIPE,

- stdout=subprocess.PIPE)

+ stdout=subprocess.PIPE,

+ env=env)

with open(path, 'r') as f:

out, _ = proc.communicate(f.read())

if proc.returncode:

« no previous file with comments | « no previous file | no next file » | no next file with comments »