Vendor virtualenv, update to 15.1.0.

recipes.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """Tool to interact with recipe repositories.
 
 This tool operates on the nearest ancestor directory containing an
 infra/config/recipes.cfg.
 """
@@ skipping 309 matching lines @@
 
   _, config_file = get_package_config(args)
   universe = loader.RecipeUniverse(package_deps, config_file)
   universe_view = loader.UniverseView(universe, package_deps.root_package)
 
   doc.main(universe_view)
 
 
 def info(args):
   from recipe_engine import package
-  repo_root, config_file = get_package_config(args)
+  _, config_file = get_package_config(args)
   package_spec = package.PackageSpec.load_proto(config_file)
 
   if args.recipes_dir:
     print package_spec.recipes_path
 
 
 # Map of arguments_pb2.Property "value" oneof conversion functions.
 #
 # The fields here should be kept in sync with the "value" oneof field names in
 # the arguments_pb2.Arguments.Property protobuf message.
@@ skipping 241 matching lines @@
 
     if args.deps_path:
       logging.warning('(Not Bad) Using custom deps path: %s', args.deps_path)
 
     # If we're bootstrapping, construct our bootstrap environment. If we're
     # using a custom deps path, install our enviornment there too.
     if args.use_bootstrap and not os.environ.pop('RECIPES_RUN_BOOTSTRAP', None):
       # Propagate our deps path, if specified, so we re-use our temporary
       # directory.
       if args.deps_path:
-        env_path = os.path.join(args.deps_path, '.ENV')
+        venv_root = os.path.join(args.deps_path, '.virtualenv')
+        env_path = os.path.join(venv_root, 'ENV')
+        bootstrap_cache_path = os.path.join(venv_root, 'bootstrap_cache')
         os.environ['RECIPES_RUN_BOOTSTRAP_DEPS_DIR'] = args.deps_path
       else:
         env_path = os.path.join(ROOT_DIR, 'ENV')
+        bootstrap_cache_path = os.path.join(ROOT_DIR, '.bootstrap_cache')
 
       logging.debug('Installing bootstrap environment into: %s', env_path)
       subprocess.check_call(
           [
             sys.executable,
             os.path.join(ROOT_DIR, 'bootstrap', 'bootstrap.py'),
             '--deps-file', os.path.join(ROOT_DIR, 'bootstrap', 'deps.pyl'),
+            '--cache-root', bootstrap_cache_path,
             env_path,
           ],
           cwd=ROOT_DIR)
 
       # Mark that we're bootstrapping, so the next invocation falls through to
       # standard recipe operation.
       os.environ['RECIPES_RUN_BOOTSTRAP'] = '1'
       args = sys.argv
       return subprocess.call(
           [
@@ skipping 93 matching lines @@
 
   if not isinstance(ret, int):
     if ret is None:
       ret = 0
     else:
       print >> sys.stderr, ret
       ret = 1
   sys.stdout.flush()
   sys.stderr.flush()
   os._exit(ret)