Fixing sdk gyp_vars mishandled in buildbot script.

native_client_sdk/src/build_tools/buildbot_common.py

 # 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.
 
 """Common utilities for all buildbot scripts that specifically don't rely
 on having a full chromium checkout.
 """
 
 import os
 import subprocess
@@ skipping 53 matching lines @@
   # buildbot_standard.SetupWindowsEnvironment expects a "context" object. We'll
   # fake enough of that here to work.
   class FakeContext(object):
     def __init__(self):
       self.env = os.environ
 
     def GetEnv(self, key):
       return self.env[key]
 
     def __getitem__(self, key):
+      # The nacl side script now needs gyp_vars to return a list.
+      if key == 'gyp_vars':
+        return []
       return self.env[key]
 
     def SetEnv(self, key, value):
       self.env[key] = value
 
     def __setitem__(self, key, value):
       self.env[key] = value
 
   context = FakeContext()
-  context['gyp_vars'] = []
   buildbot_standard.SetupWindowsEnvironment(context)
 
   # buildbot_standard.SetupWindowsEnvironment adds the directory which contains
   # vcvarsall.bat to the path, but not the directory which contains cl.exe,
   # link.exe, etc.
   # Running vcvarsall.bat adds the correct directories to the path, which we
   # extract below.
   process = subprocess.Popen('vcvarsall.bat x86 > NUL && set',
       stdout=subprocess.PIPE, env=context.env, shell=True)
   stdout, _ = process.communicate()
 
   # Parse environment from "set" command above.
   # It looks like this:
   # KEY1=VALUE1\r\n
   # KEY2=VALUE2\r\n
   # ...
-  return dict(line.split('=') for line in stdout.split('\r\n')[:-1])
+  return dict(line.split('=', 1) for line in stdout.split('\r\n')[:-1])
 
 
 def BuildStep(name):
   """Annotate a buildbot build step."""
   sys.stdout.flush()
   sys.stderr.write('\n@@@BUILD_STEP %s@@@\n' % name)
 
 
 def Run(args, cwd=None, env=None, shell=False):
   """Start a process with the provided arguments.
@@ skipping 90 matching lines @@
   # Without shell=True the windows implementation of subprocess.call will not
   # search the PATH for the executable: http://bugs.python.org/issue8557
   shell = getos.GetPlatform() == 'win'
 
   cmd = [GetGsutil(), 'cp', '-a', 'public-read', filename, full_dst]
   Run(cmd, shell=shell, cwd=cwd)
   url = 'https://storage.googleapis.com/%s/%s' % (bucket_path, filename)
   if step_link:
     sys.stdout.flush()
     sys.stderr.write('@@@STEP_LINK@download@%s@@@\n' % url)