win_toolchain/get_toolchain_if_necessary.py - Issue 1689723002: Make get_toolchain_if_necessary.py work on Mac again

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

Issue 1689723002: Make get_toolchain_if_necessary.py work on Mac again (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Created 4 years, 10 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:

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

Download patch

Index: win_toolchain/get_toolchain_if_necessary.py

diff --git a/win_toolchain/get_toolchain_if_necessary.py b/win_toolchain/get_toolchain_if_necessary.py

index 0ac500b16e85a67f877096131bcc6e1e515e353f..dbfb0eb0e29857da8eb3f9ef4bedb797f64b42f4 100755

--- a/win_toolchain/get_toolchain_if_necessary.py

+++ b/win_toolchain/get_toolchain_if_necessary.py

@@ -130,7 +130,7 @@ def CalculateHash(root, expected_hash):

path_without_hash = str(path).replace('/', '\\')

if expected_hash:

path_without_hash = path_without_hash.replace(

- os.path.join(root, expected_hash), root)

+ os.path.join(root, expected_hash).replace('/', '\\'), root)

digest.update(path_without_hash)

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

digest.update(f.read())

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