Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Unified Diff: win_toolchain/get_toolchain_if_necessary.py

Issue 1287543005: Make `python build/vs_toolchain.py update` mostly work on non-Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 5 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0a589ec7d4551c000f081f7e14d55baac7d3788f..7187bf491b71fb7860715737d4dac64bfd2b8439 100755
--- a/win_toolchain/get_toolchain_if_necessary.py
+++ b/win_toolchain/get_toolchain_if_necessary.py
@@ -57,7 +57,7 @@ def GetFileList(root):
for base, _, files in os.walk(root):
paths = [os.path.join(base, f) for f in files]
file_list.extend(x.lower() for x in paths)
- return sorted(file_list)
+ return sorted(file_list, key=lambda s: s.replace('/', '\\'))
def MakeTimestampsFileName(root):
@@ -93,7 +93,7 @@ def CalculateHash(root):
digest = hashlib.sha1()
for path in file_list:
- digest.update(path)
+ digest.update(str(path).replace('/', '\\'))
with open(path, 'rb') as f:
digest.update(f.read())
return digest.hexdigest()
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698