griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-06-06 10:23:25 +10:00
parent d98a7a7756 83a2693818
commit 7796d206c1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/addons_core/bl_pkg/bl_extension_ops.py
View File

@@ -2394,7 +2394,7 @@ class EXTENSIONS_OT_repo_lock(Operator):
return {'CANCELLED'}
self.report({'INFO'}, "Locked {:d} repos(s)".format(len(lock_result)))
BlPkgRepoLock.lock = lock_handle
EXTENSIONS_OT_repo_lock.lock = lock_handle
return {'FINISHED'}
@@ -2404,14 +2404,14 @@ class EXTENSIONS_OT_repo_unlock(Operator):
bl_label = "Unlock Repository (Testing)"
def execute(self, _context):
lock_handle = BlPkgRepoLock.lock
lock_handle = EXTENSIONS_OT_repo_lock.lock
if lock_handle is None:
self.report({'ERROR'}, "Lock not held!")
return {'CANCELLED'}
lock_result = lock_handle.release()
BlPkgRepoLock.lock = None
EXTENSIONS_OT_repo_lock.lock = None
if lock_result_any_failed_with_report(self, lock_result):
# This isn't canceled, but there were issues unlocking.