From 6b1a7e7b3bd393eb8597637a09daf7f666ae6622 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 18 Nov 2015 16:09:24 -0800
Subject: [PATCH] common: don't get env list from chromite

This call to a python script is merely used to get a static list of
environment variables that happens to be defined in that repo.
---
 common.sh | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/common.sh b/common.sh
index 1e82d5b7d8..a097c47ef1 100644
--- a/common.sh
+++ b/common.sh
@@ -218,11 +218,29 @@ get_gclient_root() {
 
 # Populate the ENVIRONMENT_WHITELIST array.
 load_environment_whitelist() {
-  set -f
   ENVIRONMENT_WHITELIST=(
-    $("${GCLIENT_ROOT}/chromite/scripts/cros_env_whitelist")
+    CHROMEOS_OFFICIAL
+    CHROMEOS_VERSION_AUSERVER
+    CHROMEOS_VERSION_DEVSERVER
+    CHROMEOS_VERSION_TRACK
+    GCC_GITHASH
+    GIT_AUTHOR_EMAIL
+    GIT_AUTHOR_NAME
+    GIT_COMMITTER_EMAIL
+    GIT_COMMITTER_NAME
+    GIT_PROXY_COMMAND
+    GIT_SSH
+    RSYNC_PROXY
+    GPG_AGENT_INFO
+    SSH_AGENT_PID
+    SSH_AUTH_SOCK
+    USE
+    all_proxy
+    ftp_proxy
+    http_proxy
+    https_proxy
+    no_proxy
   )
-  set +f
 }
 
 # Find root of source tree