From 0a94e8ddfbf43b69c459a096ce4e284255fdbc16 Mon Sep 17 00:00:00 2001 From: "kustermann@google.com" Date: Thu, 13 Jun 2013 10:36:56 +0000 Subject: [PATCH] Remove AWS_CREDENTIAL_FILE env-variable for editor bots as well R=ricow@google.com Review URL: https://codereview.chromium.org//16923004 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@23963 260f80e4-7a28-3924-810f-c04153c831b5 --- client/tools/buildbot_annotated_steps.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/tools/buildbot_annotated_steps.py b/client/tools/buildbot_annotated_steps.py index 0eba6d52b6c..c7360e9c735 100755 --- a/client/tools/buildbot_annotated_steps.py +++ b/client/tools/buildbot_annotated_steps.py @@ -105,10 +105,12 @@ def ProcessTools(mode, name, version): '--mode=' + mode, '--revision=' + version, '--name=' + name, '--out=' + outdir] local_env = os.environ.copy() - # The buildbot sets BOTO_CONFIG to the chromium specific file, we use the one - # in home. + # The buildbot sets AWS_CREDENTIAL_FILE/BOTO_CONFIG to the chromium specific + # file, we use the one in home. if 'BOTO_CONFIG' in local_env: del local_env['BOTO_CONFIG'] + if 'AWS_CREDENTIAL_FILE' in local_env: + del local_env['AWS_CREDENTIAL_FILE'] #if 'linux' in name: # javahome = os.path.join(os.path.expanduser('~'), 'jdk1.6.0_25') # local_env['JAVA_HOME'] = javahome