Change --variable argument, must now be spaced, -V foo bar, instead of -V foo=bar.

tools/isolate/isolate.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.
 
 """Does one of the following depending on the --mode argument:
   check     Verifies all the inputs exist, touches the file specified with
             --result and exits.
   hashtable Puts a manifest file and hard links each of the inputs into the
             output directory.
@@ skipping 400 matching lines @@
       False)
 
 
 def get_valid_modes():
   """Returns the modes that can be used."""
   return sorted(
       i[4:] for i in dir(sys.modules[__name__]) if i.startswith('MODE'))
 
 
 def main():
-  default_variables = ['OS=%s' % trace_inputs.get_flavor()]
+  default_variables = [('OS', trace_inputs.get_flavor())]
   if sys.platform in ('win32', 'cygwin'):
-    default_variables.append('EXECUTABLE_SUFFIX=.exe')
+    default_variables.append(('EXECUTABLE_SUFFIX', '.exe'))
   else:
-    default_variables.append('EXECUTABLE_SUFFIX=')
+    default_variables.append(('EXECUTABLE_SUFFIX', ''))
   valid_modes = get_valid_modes()
   parser = optparse.OptionParser(
       usage='%prog [options] [.isolate file]',
       description=sys.modules[__name__].__doc__)
   parser.format_description = lambda *_: parser.description
   parser.add_option(
       '-v', '--verbose',
       action='count',
       default=int(os.environ.get('ISOLATE_DEBUG', 0)),
       help='Use multiple times')
   parser.add_option(
       '-m', '--mode',
       choices=valid_modes,
       help='Determines the action to be taken: %s' % ', '.join(valid_modes))
   parser.add_option(
       '-r', '--result',
       metavar='FILE',
       help='Result file to store the json manifest')
   parser.add_option(
       '-V', '--variable',
+      nargs=2,
       action='append',
       default=default_variables,
       dest='variables',
-      metavar='FOO=BAR',
+      metavar='FOO BAR',
       help='Variables to process in the .isolate file, default: %default')
   parser.add_option(
       '-o', '--outdir', metavar='DIR',
       help='Directory used to recreate the tree or store the hash table. '
            'If the environment variable ISOLATE_HASH_TABLE_DIR exists, it will '
            'be used. Otherwise, for run and remap, uses a /tmp subdirectory. '
            'For the other modes, defaults to the directory containing --result')
 
   options, args = parser.parse_args()
   level = [logging.ERROR, logging.INFO, logging.DEBUG][min(2, options.verbose)]
   logging.basicConfig(
       level=level,
       format='%(levelname)5s %(module)15s(%(lineno)3d): %(message)s')
 
   if not options.mode:
     parser.error('--mode is required')
   if len(args) != 1:
     parser.error('Use only one argument which should be a .isolate file')
 
   input_file = os.path.abspath(args[0])
   isolate_dir = os.path.dirname(input_file)
 
   # Extract the variables.
-  variables = dict(i.split('=', 1) for i in options.variables)
+  variables = dict(options.variables)
   # Process path variables as a special case. First normalize it, verifies it
   # exists, convert it to an absolute path, then set it as relative to
   # isolate_dir.
   for i in ('PRODUCT_DIR',):
     if i not in variables:
       continue
     variable = os.path.normpath(variables[i])
     if not os.path.isdir(variable):
       parser.error('%s=%s is not a directory' % (i, variable))
     variable = os.path.abspath(variable)
@@ skipping 40 matching lines @@
         command,
         relative_dir,
         options.result)
   except run_test_from_archive.MappingError, e:
     print >> sys.stderr, str(e)
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())