Automated rollback of commit 1bf174a.

*** Reason for rollback *** Manual testing shows that this broke builds quotes are correctly recognized in the build command arguments, rolling back to unblock the release *** Original change description *** Enclosing the aspect directory path in double quotation marks to support paths with spaces. (cherry picked from commit 85a253d)
bazelbuild · May 27, 2024 · 932b3f7 · 932b3f7
1 parent f812bc3
commit 932b3f7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectStrategyBazel.java b/base/src/com/google/idea/blaze/base/sync/aspects/strategy/AspectStrategyBazel.java
@@ -74,6 +74,6 @@ private static File findAspectDirectory() {
   }
 
   private static String getAspectRepositoryOverrideFlag() {
-    return OVERRIDE_REPOSITORY_FLAG + "=\"" + findAspectDirectory().getPath() + "\"";
+    return OVERRIDE_REPOSITORY_FLAG + "=" + findAspectDirectory().getPath();
   }
 }
diff --git a/java/src/com/google/idea/blaze/java/fastbuild/BazelFastBuildAspectStrategy.java b/java/src/com/google/idea/blaze/java/fastbuild/BazelFastBuildAspectStrategy.java
@@ -47,7 +47,7 @@ private static File findAspectDirectory() {
 
   private static String getAspectRepositoryOverrideFlag() {
     return String.format(
-        "--override_repository=intellij_aspect=\"%s\"", findAspectDirectory().getPath());
+        "--override_repository=intellij_aspect=%s", findAspectDirectory().getPath());
   }
 
   @Override

diff --git a/java/src/com/google/idea/blaze/java/run/hotswap/JavaClasspathAspectStrategy.java b/java/src/com/google/idea/blaze/java/run/hotswap/JavaClasspathAspectStrategy.java
@@ -70,7 +70,7 @@ public ImmutableList<String> getBuildFlags(BlazeVersionData versionData) {
 
     private static String getAspectRepositoryOverrideFlag() {
       return String.format(
-          "--override_repository=intellij_aspect=\"%s\"", findAspectDirectory().getPath());
+          "--override_repository=intellij_aspect=%s", findAspectDirectory().getPath());
     }
 
     private static File findAspectDirectory() {