Add symlink locking for filesystems that do not support hardlinks

AcademySoftwareFoundation · Apr 4, 2024 · 2a85f70 · 2a85f70
1 parent d5c8643
commit 2a85f70
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/rezplugins/package_repository/filesystem.py b/src/rezplugins/package_repository/filesystem.py
@@ -467,7 +467,7 @@ class FileSystemPackageRepository(PackageRepository):
     """
     schema_dict = {"file_lock_timeout": int,
                    "file_lock_dir": Or(None, str),
-                   "file_lock_type": Or("default", "link", "mkdir"),
+                   "file_lock_type": Or("default", "link", "mkdir", "symlink"),
                    "package_filenames": [str]}
 
     building_prefix = ".building"
@@ -973,6 +973,8 @@ def _lock_package(self, package_name, package_version=None):
             from rez.vendor.lockfile.mkdirlockfile import MkdirLockFile as LockFile
         elif _settings.file_lock_type == 'link':
             from rez.vendor.lockfile.linklockfile import LinkLockFile as LockFile
+        elif _settings.file_lock_type == 'symlink':
+            from rez.vendor.lockfile.symlinklockfile import SymlinkLockFile as LockFile
 
         path = self.location
 

diff --git a/src/rezplugins/package_repository/rezconfig b/src/rezplugins/package_repository/rezconfig
@@ -1,8 +1,8 @@
 filesystem:
     # The mechanism used to create the lockfile. If set to 'default', this will
     # use hardlinks if the 'os.link' method is present, otherwise mkdir is used.
-    # It can also be explicitly set to use only 'hardlink', or only 'mkdir'.
-    # Valid options are 'default', 'mkdir', or 'hardlink'
+    # It can also be explicitly set to use only 'link', 'symlink', or only 'mkdir'.
+    # Valid options are 'default', 'mkdir', 'link', or 'symlink'
     file_lock_type: default
 
     # The timeout to use when creating file locks. This is done when a variant is