Cache/retrieve extracted CIPD packages in local isolate cache

client/isolateserver.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.
 
 """Archives a set of files or directories to an Isolate Server."""
 
 __version__ = '0.8.0'
 
 import errno
@@ skipping 1701 matching lines @@
             logging.info(msg)
             last_update = time.time()
 
   # Cache could evict some items we just tried to fetch, it's a fatal error.
   if not fetch_queue.verify_all_cached():
     raise isolated_format.MappingError(
         'Cache is too small to hold all requested files')
   return bundle
 
 
-def directory_to_metadata(root, algo, blacklist):
+def directory_to_metadata(root, algo, blacklist, collapse_symlinks):
   """Returns the FileItem list and .isolated metadata for a directory."""
   root = file_path.get_native_path_case(root)
   paths = isolated_format.expand_directory_and_symlink(
       root, '.' + os.path.sep, blacklist, sys.platform != 'win32')
   metadata = {
     relpath: isolated_format.file_to_metadata(
-        os.path.join(root, relpath), {}, 0, algo, False)
+        os.path.join(root, relpath), {}, 0, algo, collapse_symlinks)
     for relpath in paths
   }
   for v in metadata.itervalues():
     v.pop('t')
   items = [
       FileItem(
           path=os.path.join(root, relpath),
           digest=meta['h'],
           size=meta['s'],
           high_priority=relpath.endswith('.isolated'))
@@ skipping 25 matching lines @@
   tempdir = None
   try:
     # TODO(maruel): Yield the files to a worker thread.
     items_to_upload = []
     for f in files:
       try:
         filepath = os.path.abspath(f)
         if fs.isdir(filepath):
           # Uploading a whole directory.
           items, metadata = directory_to_metadata(
-              filepath, storage.hash_algo, blacklist)
+              filepath, storage.hash_algo, blacklist, False)
 
           # Create the .isolated file.
           if not tempdir:
             tempdir = tempfile.mkdtemp(prefix=u'isolateserver')
           handle, isolated = tempfile.mkstemp(dir=tempdir, suffix=u'.isolated')
           os.close(handle)
           data = {
               'algo':
                   isolated_format.SUPPORTED_ALGOS_REVERSE[storage.hash_algo],
               'files': metadata,
@@ skipping 260 matching lines @@
   return dispatcher.execute(OptionParserIsolateServer(), args)
 
 
 if __name__ == '__main__':
   subprocess42.inhibit_os_error_reporting()
   fix_encoding.fix_encoding()
   tools.disable_buffering()
   colorama.init()
   file_path.enable_symlink()
   sys.exit(main(sys.argv[1:]))