1 files changed, 4 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java
index 23eec44981..e8d744b91d 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java
@@ -180,11 +180,12 @@ public class BazelRepositoryModule extends BlazeModule {
   }
 
   @Override
-  public void handleOptions(OptionsProvider optionsProvider) {
-    PackageCacheOptions pkgOptions = optionsProvider.getOptions(PackageCacheOptions.class);
+  public void beforeCommand(CommandEnvironment env) {
+    delegator.setClientEnvironment(env.getActionClientEnv());
+    PackageCacheOptions pkgOptions = env.getOptions().getOptions(PackageCacheOptions.class);
     isFetch.set(pkgOptions != null && pkgOptions.fetch);
 
-    RepositoryOptions repoOptions = optionsProvider.getOptions(RepositoryOptions.class);
+    RepositoryOptions repoOptions = env.getOptions().getOptions(RepositoryOptions.class);
     if (repoOptions != null) {
       if (repoOptions.experimentalRepositoryCache != null) {
         Path repositoryCachePath = filesystem.getPath(repoOptions.experimentalRepositoryCache);
@@ -216,11 +217,6 @@ public class BazelRepositoryModule extends BlazeModule {
   }
 
   @Override
-  public void beforeCommand(CommandEnvironment env) {
-    delegator.setClientEnvironment(env.getActionClientEnv());
-  }
-
-  @Override
   public Iterable<Class<? extends OptionsBase>> getCommandOptions(Command command) {
     return ImmutableSet.of("fetch", "build", "query").contains(command.name())
         ? ImmutableList.<Class<? extends OptionsBase>>of(RepositoryOptions.class)