Chromium Code Reviews| 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..481c8af98079948c454333c0a5b10d3c5c174437 100755 |
| --- a/win_toolchain/get_toolchain_if_necessary.py |
| +++ b/win_toolchain/get_toolchain_if_necessary.py |
| @@ -111,6 +111,8 @@ 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 |
|
scottmg
2016/02/02 22:55:13
This will probably need a stdout.flush() or you wo
brucedawson
2016/02/03 00:19:49
Done.
|
| digest = hashlib.sha1() |
| for path in file_list: |
| digest.update(str(path).replace('/', '\\')) |
| @@ -293,16 +295,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 '-'*80 |
| - print 'Elevation required. You must manually install this update:' |
| + print 'Elevation required. You can manually install this update:' |
| print ' %s' % installer |
| - print '-'*80 |
| - raise Exception('Elevation required. You must manually install %s' % |
| - installer) |
| + return |
| raise e |