swarming: custom cipd package paths

client/swarming.py

 #!/usr/bin/env python
 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Client tool to trigger tasks or retrieve results from a Swarming server."""
 
 __version__ = '0.8.5'
 
 import collections
@@ skipping 1392 matching lines @@
           properties['inputs_ref']['isolated'],
           storage,
           isolateserver.MemoryCache(file_mode_mask=0700),
           workdir)
       command = bundle.command
       if bundle.relative_cwd:
         workdir = os.path.join(workdir, bundle.relative_cwd)
       command.extend(properties.get('extra_args') or [])
     # https://github.com/luci/luci-py/blob/master/appengine/swarming/doc/Magic-Values.md
     new_command = run_isolated.process_command(
-        command, options.output_dir, None, None)
+        command, options.output_dir, None)
     if not options.output_dir and new_command != command:
       parser.error('The task has outputs, you must use --output-dir')
     command = new_command
   else:
     command = properties['command']
   try:
     return subprocess.call(command + extra_args, env=env, cwd=workdir)
   except OSError as e:
     print >> sys.stderr, 'Failed to run: %s' % ' '.join(command)
     print >> sys.stderr, str(e)
@@ skipping 118 matching lines @@
   dispatcher = subcommand.CommandDispatcher(__name__)
   return dispatcher.execute(OptionParserSwarming(version=__version__), args)
 
 
 if __name__ == '__main__':
   subprocess42.inhibit_os_error_reporting()
   fix_encoding.fix_encoding()
   tools.disable_buffering()
   colorama.init()
   sys.exit(main(sys.argv[1:]))