Use corrected env for first sync too.

slave/run_slave.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """ Initialize the environment variables and start the buildbot slave.
 """
 
 import os
 import re
@@ skipping 263 matching lines @@
     tw_ver = getattr(master, 'twisted_version', tw_ver)
   print 'Using %s and %s' % (bb_ver, tw_ver)
   return (bb_ver, tw_ver)
 
 
 def error(msg):
   print >> sys.stderr, msg
   sys.exit(1)
 
 
+def UseBotoPath():
+  """Mutate the environment to reference the prefered gs credentials."""
+  # Get the path to the boto file containing the password.
+  boto_file = os.path.join(BUILD_DIR, 'site_config', '.boto')
+  # If the boto file exists, make sure gsutil uses this boto file.
+  if os.path.exists(boto_file):
+    os.environ['AWS_CREDENTIAL_FILE'] = boto_file
+    os.environ['BOTO_CONFIG'] = boto_file
+
+
 def main():
   # Use adhoc argument parsing because of twisted's twisted argument parsing.
   # Change the current directory to the directory of the script.
   os.chdir(SCRIPT_DIR)
   depot_tools = os.path.join(ROOT_DIR, 'depot_tools')
   if not os.path.isdir(depot_tools):
     error('You must put a copy of depot_tools in %s' % depot_tools)
   bot_password_file = os.path.normpath(
       os.path.join(BUILD_DIR, 'site_config', '.bot_password'))
   if not os.path.isfile(bot_password_file):
@@ skipping 138 matching lines @@
         depot_tools,
         # Reuse the python executable used to start this script.
         os.path.dirname(sys.executable),
         '/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin'
     ]
     os.environ['PATH'] = os.pathsep.join(slave_path)
 
   else:
     error('Platform %s is not implemented yet' % sys.platform)
 
-  # Get the path to the boto file containing the password.
-  boto_file = os.path.join(BUILD_DIR, 'site_config', '.boto')
-  # If the boto file exists, make sure gsutil uses this boto file.
-  if os.path.exists(boto_file):
-    os.environ['AWS_CREDENTIAL_FILE'] = boto_file
-    os.environ['BOTO_CONFIG'] = boto_file
+  # This may be redundant, unless this is imported and main is called.
+  UseBotoPath()
 
   # This envrionment is defined only when testing the slave on a dev machine.
   is_testing = 'TESTING_MASTER' in os.environ
   if not is_testing:
     # Don't overwrite the ~/.subversion/config file when TESTING_MASTER is set.
     FixSubversionConfig()
   HotPatchSlaveBuilder(is_testing)
 
   import twisted.scripts.twistd as twistd
   twistd.run()
   if needs_reboot:
     # Send the appropriate system shutdown command.
     Reboot()
     # This line should not be reached.
 
 
 def GetGClientPath():
   """Returns path to local gclient executable."""
   gclient_path = os.path.join(ROOT_DIR, 'depot_tools', 'gclient')
   if sys.platform.startswith('win'):
     return gclient_path + '.bat'
   return gclient_path
 
 
 if '__main__' == __name__:
   skip_sync_arg = '--no-gclient-sync'
   if skip_sync_arg not in sys.argv:
+    UseBotoPath()

[Isaac (away), 2013/07/04 20:56:15]

Move this one line up and I think you can skip the call on 452

     if subprocess.call([GetGClientPath(), 'sync', '--force']) != 0:
       print >> sys.stderr, (
           '(%s) `gclient sync` failed; proceeding anyway...' % sys.argv[0])
     os.execv(sys.executable, [sys.executable] + sys.argv + [skip_sync_arg])
 
   # Remove skip_sync_arg from arg list.  Needed because twistd.
   sys.argv.remove(skip_sync_arg)
   main()