Cache/retrieve extracted CIPD packages in local isolate cache

client/isolateserver.py

Index: client/isolateserver.py
diff --git a/client/isolateserver.py b/client/isolateserver.py
index c8feb0961a2e1e3785cf265c122b827c88771537..c4a97ebc9e47e3ce3984173dde99297a2f2b51e3 100755
--- a/client/isolateserver.py
+++ b/client/isolateserver.py
@@ -1719,14 +1719,14 @@ def fetch_isolated(isolated_hash, storage, cache, outdir, use_symlinks):
   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():
@@ -1772,7 +1772,7 @@ def archive_files_to_storage(storage, files, blacklist):
         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: