Index: scripts/slave/ios/find_xcode.py |
diff --git a/scripts/slave/ios/find_xcode.py b/scripts/slave/ios/find_xcode.py |
index 1a58191887776e10c7578c7d5b845097e2b794f6..026364fbbdbab360d66540b9a2335be933f7b7bb 100755 |
--- a/scripts/slave/ios/find_xcode.py |
+++ b/scripts/slave/ios/find_xcode.py |
@@ -139,11 +139,20 @@ def find_xcode(target_version): |
build_version, |
) |
- if version == target_version: |
- xcode_info['matches'][installation_path] = "%s (%s)" % ( |
- version, |
- build_version, |
- ) |
+ # TODO(smut): Remove prefix matching hack when http://crbug.com/461005 |
+ # is fixed. |
+ if os.environ.get('BUILDBOT_MASTERNAME') == 'tryserver.chromium.mac': |
+ if version.startswith(target_version): |
+ xcode_info['matches'][installation_path] = "%s (%s)" % ( |
+ version, |
+ build_version, |
+ ) |
+ else: |
+ if version == target_version: |
+ xcode_info['matches'][installation_path] = "%s (%s)" % ( |
+ version, |
+ build_version, |
+ ) |
# If this is the first match, switch to it. |
if not xcode_info['found']: |