Use corrected env for first sync too.

slave/run_slave.py

Index: slave/run_slave.py
===================================================================
--- slave/run_slave.py	(revision 210203)
+++ slave/run_slave.py	(working copy)
@@ -281,6 +281,16 @@
   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.
@@ -439,12 +449,8 @@
   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
@@ -472,6 +478,7 @@
 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])