Stop consulting the environment for "originating user" information.

--
MOS_MIGRATED_REVID=135422529

1 files changed, 1 insertions, 10 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/util/UserUtils.java b/src/main/java/com/google/devtools/build/lib/util/UserUtils.java
index 08e6f09ef4..84fb21540d 100644
--- a/src/main/java/com/google/devtools/build/lib/util/UserUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/util/UserUtils.java
@@ -18,15 +18,11 @@ import static com.google.common.base.StandardSystemProperty.USER_NAME;
 
 import com.google.common.base.Strings;
 
-import java.util.Map;
-
 /**
  * User information utility methods.
  */
 public final class UserUtils {
 
-  private static final String ORIGINATING_USER_KEY = "BLAZE_ORIGINATING_USER";
-
   private UserUtils() {
     // prohibit instantiation
   }
@@ -45,16 +41,11 @@ public final class UserUtils {
   /**
    * Returns the originating user for this build from the command-line or the environment.
    */
-  public static String getOriginatingUser(String originatingUser,
-                                          Map<String, String> clientEnv) {
+  public static String getOriginatingUser(String originatingUser) {
     if (!Strings.isNullOrEmpty(originatingUser)) {
       return originatingUser;
     }
 
-    if (!Strings.isNullOrEmpty(clientEnv.get(ORIGINATING_USER_KEY))) {
-      return clientEnv.get(ORIGINATING_USER_KEY);
-    }
-
     return UserUtils.getUserName();
   }
 }