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

Unified Diff: win_toolchain/get_toolchain_if_necessary.py

Issue 1660723002: Updates to package VS 2015 to not require UCRT (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Add blank line per code review Created 4 years, 11 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 | win_toolchain/package_from_installed.py » ('j') | 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 0b6e62d726b88f1628cc6e43973adc322423470c..9363a85782c5a7ae065860b12c85f4e66098c494 100755
--- a/win_toolchain/get_toolchain_if_necessary.py
+++ b/win_toolchain/get_toolchain_if_necessary.py
@@ -111,6 +111,9 @@ def CalculateHash(root):
if matches:
return timestamps_data['sha1']
+ # Make long hangs when updating the toolchain less mysterious.
+ print 'Calculating hash of toolchain in %s. Please wait...' % root
+ sys.stdout.flush()
digest = hashlib.sha1()
for path in file_list:
digest.update(str(path).replace('/', '\\'))
@@ -293,16 +296,9 @@ def InstallUniversalCRTIfNeeded(abs_target_dir):
# Trap OSError instead of WindowsError so pylint will succeed on Linux.
except OSError as e:
if e.winerror == 740: # The requested operation requires elevation
- print
- print '-'*80
- print
- print 'Elevation required. You must manually install this update:'
+ print 'Elevation required. You can manually install this update:'
print ' %s' % installer
- print
- print '-'*80
- print
- raise Exception('Elevation required. You must manually install %s' %
- installer)
+ return
raise e
« no previous file with comments | « no previous file | win_toolchain/package_from_installed.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698