Review feedback

# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
pantsbuild · Feb 17, 2021 · 00f6f15 · 00f6f15
1 parent cea9142
commit 00f6f15
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/python/pants/option/global_options.py b/src/python/pants/option/global_options.py
@@ -187,16 +187,13 @@ def from_options(cls, options: Options) -> ExecutionOptions:
             else:
                 remote_execution_headers = auth_plugin_result.execution_headers
                 remote_store_headers = auth_plugin_result.store_headers
-                if (
-                    remote_instance_name is not None
-                    and remote_instance_name != auth_plugin_result.instance_name
-                ):
+                if remote_instance_name != auth_plugin_result.instance_name:
                     logger.debug(
                         f"Overriding `--remote-instance-name={repr(remote_instance_name)}` to "
                         f"instead be {repr(auth_plugin_result.instance_name)} due to the plugin "
                         "from `--remote-auth-plugin`."
                     )
-                remote_instance_name = auth_plugin_result.instance_name
+                    remote_instance_name = auth_plugin_result.instance_name
 
         return cls(
             # Remote execution strategy.
@@ -835,9 +832,9 @@ def register_bootstrap_options(cls, register):
             advanced=True,
             help=(
                 "Name of the remote instance to use by remote caching and remote execution.\n\n"
-                "This is used by some remote servers used for for routing. Consult your remote "
-                "server for whether this should be set.\n\nYou can also use "
-                "`--remote-auth-plugin` to provide a plugin to dynamically set this value."
+                "This is used by some remote servers for routing. Consult your remote server for "
+                "whether this should be set.\n\nYou can also use `--remote-auth-plugin` to provide "
+                "a plugin to dynamically set this value."
             ),
         )
         register(