From 6b1635279e8b33dc1ac505ac81825e38f8797a14 Mon Sep 17 00:00:00 2001 From: John Millikin Date: Thu, 7 Jun 2018 04:16:50 -0700 Subject: Allow disabling the simple blob caches via CLI flag overrides. This fixes a regression from v0.13. When the local disk cache flags were unified into `--disk_cache`, it became impossible to override a default cache location such that the cache became disabled. This prevents canarying of remote execution in the presence of a default bazelrc that enables the disk cache. Fixes #5308 Closes #5338. PiperOrigin-RevId: 199613922 --- .../com/google/devtools/build/lib/remote/SimpleBlobStoreFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactory.java b/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactory.java index 7d893fbd4a..47a14bffdd 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactory.java +++ b/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactory.java @@ -75,7 +75,7 @@ public final class SimpleBlobStoreFactory { } public static boolean isDiskCache(RemoteOptions options) { - return options.diskCache != null; + return options.diskCache != null && !options.diskCache.isEmpty(); } static boolean isRestUrlOptions(RemoteOptions options) { -- cgit v1.2.3