Chromium Code Reviews| Index: build/mac_toolchain.py |
| diff --git a/build/mac_toolchain.py b/build/mac_toolchain.py |
| index 4de6e05c6509f5aa3c36f932522e005fbaace2ca..4e04f961fe6a464888659d150be00ea0d468499e 100755 |
| --- a/build/mac_toolchain.py |
| +++ b/build/mac_toolchain.py |
| @@ -109,7 +109,7 @@ def LoadPlist(path): |
| os.unlink(name) |
| -def AcceptLicense(directory): |
|
justincohen
2016/05/11 13:52:21
and remove this.
|
| +def AcceptLicense(): |
| """Use xcodebuild to accept new toolchain license if necessary. Don't accept |
| the license if a newer license has already been accepted. This only works if |
| xcodebuild and xcode-select are passwordless in sudoers.""" |
| @@ -135,7 +135,7 @@ def AcceptLicense(directory): |
| # Don't accept the license of older toolchain builds, this will break the |
| # license of newer builds. |
| return |
| - except (subprocess.CalledProcessError, KeyError) as e: |
| + except (subprocess.CalledProcessError, KeyError): |
| # If there's never been a license of type |build_type| accepted, |
| # |target_license_plist_path| or |agreed_to_key| may not exist. |
| pass |
| @@ -199,8 +199,9 @@ def main(): |
| print 'Toolchain %s unpacked.' % toolchain_revision |
| WriteStampFile(toolchain_revision) |
| return 0 |
| - except: |
| + except Exception as e: |
| print 'Failed to download toolchain %s.' % toolchain_file |
| + print 'Exception %s' % e |
| print 'Exiting.' |
| return 1 |