Remove AWS_CREDENTIAL_FILE env-variable for editor bots as well

client/tools/buildbot_annotated_steps.py

 #!/usr/bin/python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Dart client buildbot steps
@@ skipping 87 matching lines @@
   # TODO(devoncarew): should we move this into GetBuildInfo()?
   # get the latest changed revision from the current repository sub-tree
   version = GetLatestChangedRevision()
 
   utils = GetUtils()
   outdir = GetOutDir(utils, mode)
   cmds = [sys.executable, toolsBuildScript,
           '--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
   #  local_env['PATH'] = (os.path.join(javahome, 'bin') +
   #                       os.pathsep + local_env['PATH'])
 
   return subprocess.call(cmds, env=local_env)
 
 def ProcessBot(name, target):
   '''
@@ skipping 103 matching lines @@
     status = ProcessBot(name, 'compiler')
 
   if status:
     print '@@@STEP_FAILURE@@@'
 
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())