run_isolated: support non-isolated commands

client/isolateserver.py

 #!/usr/bin/env python
 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed by the Apache v2.0 license that can be
 # found in the LICENSE file.
 
 """Archives a set of files or directories to an Isolate Server."""
 
-__version__ = '0.4.7'
+__version__ = '0.4.8'
 
 import base64
 import functools
 import logging
 import optparse
 import os
 import re
 import signal
 import sys
 import tempfile
@@ skipping 2056 matching lines @@
   is uploaded. Then this .isolated file can be included in another one to run
   commands.
 
   The commands output each file that was processed with its content hash. For
   directories, the .isolated generated for the directory is listed as the
   directory entry itself.
   """
   add_isolate_server_options(parser)
   add_archive_options(parser)
   options, files = parser.parse_args(args)
-  process_isolate_server_options(parser, options, True)
+  process_isolate_server_options(parser, options, True, True)
   try:
     archive(options.isolate_server, options.namespace, files, options.blacklist)
   except Error as e:
     parser.error(e.args[0])
   return 0
 
 
 def CMDdownload(parser, args):
   """Download data from the server.
 
   It can either download individual files or a complete tree from a .isolated
   file.
   """
   add_isolate_server_options(parser)
   parser.add_option(
       '-s', '--isolated', metavar='HASH',
       help='hash of an isolated file, .isolated file content is discarded, use '
            '--file if you need it')
   parser.add_option(
       '-f', '--file', metavar='HASH DEST', default=[], action='append', nargs=2,
       help='hash and destination of a file, can be used multiple times')
   parser.add_option(
       '-t', '--target', metavar='DIR', default='download',
       help='destination directory')
   add_cache_options(parser)
   options, args = parser.parse_args(args)
   if args:
     parser.error('Unsupported arguments: %s' % args)
 
-  process_isolate_server_options(parser, options, True)
+  process_isolate_server_options(parser, options, True, True)
   if bool(options.isolated) == bool(options.file):
     parser.error('Use one of --isolated or --file, and only one.')
 
   cache = process_cache_options(options)
   options.target = unicode(os.path.abspath(options.target))
   if options.isolated:
     if (fs.isfile(options.target) or
         (fs.isdir(options.target) and fs.listdir(options.target))):
       parser.error(
           '--target \'%s\' exists, please use another target' % options.target)
@@ skipping 47 matching lines @@
       '-I', '--isolate-server',
       metavar='URL', default=os.environ.get('ISOLATE_SERVER', ''),
       help='URL of the Isolate Server to use. Defaults to the environment '
            'variable ISOLATE_SERVER if set. No need to specify https://, this '
            'is assumed.')
   parser.add_option(
       '--namespace', default='default-gzip',
       help='The namespace to use on the Isolate Server, default: %default')
 
 
-def process_isolate_server_options(parser, options, set_exception_handler):
-  """Processes the --isolate-server option and aborts if not specified.
+def process_isolate_server_options(
+    parser, options, set_exception_handler, required):
+  """Processes the --isolate-server option.
 
   Returns the identity as determined by the server.
   """
   if not options.isolate_server:
-    parser.error('--isolate-server is required.')
+    if required:
+      parser.error('--isolate-server is required.')
+    return
+
   try:
     options.isolate_server = net.fix_url(options.isolate_server)
   except ValueError as e:
     parser.error('--isolate-server %s' % e)
   if set_exception_handler:
     on_error.report_on_exception_exit(options.isolate_server)
   try:
     return auth.ensure_logged_in(options.isolate_server)
   except ValueError as e:
     parser.error(str(e))
@@ skipping 61 matching lines @@
 def main(args):
   dispatcher = subcommand.CommandDispatcher(__name__)
   return dispatcher.execute(OptionParserIsolateServer(), args)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   tools.disable_buffering()
   colorama.init()
   sys.exit(main(sys.argv[1:]))