diff options
| author |  Ty Book <ty.book@redfin.com> | 2017-04-07 13:25:21 +0000 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-04-07 16:44:48 +0200 |
| commit | e21f82fce8ddf7d2325e3f730e5a9ac973ea4e1e (patch) | |
| tree | bd241c8bf14f9adf4c2665bea8716922d034b82c /src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxRunner.java | |
| parent | caafb92b575bb5ab7ea559fa47f685023b961d6b (diff) | |
Fix bug breaking sandboxing on macOS 10.12
macOS version strings that have only two components, e.g. "10.12", were
always failing the check that the macOS version is >= 10.11, causing
Bazel to erroneously think sandboxing isn't supported
Change-Id: Ifa4a01fc304e7620502d3f0f9f70c3b500d23864
PiperOrigin-RevId: 152493682
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxRunner.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxRunner.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxRunner.java index 471158a29e..4a2fc4265d 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxRunner.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxRunner.java @@ -64,8 +64,8 @@ final class DarwinSandboxRunner extends SandboxRunner { // And we should check if sandbox still work when it gets 11.x String osxVersion = OS.getVersion(); String[] parts = osxVersion.split("\\."); - if (parts.length != 3) { - // Currently the format is 10.11.x + if (parts.length < 2 || parts.length > 3) { + // Can be 10.xx or 10.xx.yy format return false; } try { |