bootstrap/bootstrap.py - Issue 479583002: Fix virtualenv activation on Windows.

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: bootstrap/bootstrap.py

Issue 479583002: Fix virtualenv activation on Windows. (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master

Patch Set: Address review comment Created 6 years, 4 months ago

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

Jump to:

Index: bootstrap/bootstrap.py

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

index c313a83e96aeab8c1b6e36235777c19b4fa8f159..a089a7d0a92312fd5a0becf69bf186e73953b2d9 100755

--- a/bootstrap/bootstrap.py

+++ b/bootstrap/bootstrap.py

@@ -145,7 +145,8 @@ def activate_env(env, deps):

env, search_dirs=virtualenv.file_search_dirs())

print ' Activating environment'

- activate_this = os.path.join(env, 'bin', 'activate_this.py')

+ bin_dir = 'Scripts' if virtualenv.is_win else 'bin'

+ activate_this = os.path.join(env, bin_dir, 'activate_this.py')

execfile(activate_this, dict(__file__=activate_this))

if cur_deps is None:

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