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

Extensions: use replace exists with lexists to check a path can be used

Browse Source 
Without this, a broken symbolic-link wasn't removed, causing renaming
to fail.
This commit is contained in:
Campbell Barton
2024-11-29 12:55:29 +11:00
parent c1bc1ef3ea
commit b295fc9a9c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/addons_core/bl_pkg/cli/blender_ext.py
View File

@@ -646,7 +646,7 @@ def rmtree_with_fallback_or_error_pseudo_atomic(
path_test = path_base
test_count = 0
# Unlikely this exists.
while os.path.exists(path_test):
while os.path.lexists(path_test):
path_test = "{:s}{:d}".format(path_base, test_count)
test_count += 1
# Very unlikely, something is likely incorrect in the setup, avoid hanging.
@@ -4039,7 +4039,7 @@ class subcmd_client:
filepath_local_pkg_temp = filepath_local_pkg + "@"
# It's unlikely this exist, nevertheless if it does - it must be removed.
if os.path.exists(filepath_local_pkg_temp):
if os.path.lexists(filepath_local_pkg_temp):
if (error := rmtree_with_fallback_or_error(filepath_local_pkg_temp)) is not None:
msglog.error(
"Failed to remove temporary directory for \"{:s}\": {:s}".format(manifest.id, error),
@@ -4064,12 +4064,12 @@ class subcmd_client:
# check for any file since the existence of a file should not break installation.
# Besides users manually creating files, this could occur from broken symbolic-links
# or an incorrectly repaired corrupt file-system.
if os.path.exists(filepath_local_pkg):
if os.path.lexists(filepath_local_pkg):
if (error := rmtree_with_fallback_or_error_pseudo_atomic(
filepath_local_pkg,
temp_prefix_and_suffix=temp_prefix_and_suffix,
)) is not None:
if os.path.exists(filepath_local_pkg):
if os.path.lexists(filepath_local_pkg):
msglog.error("Failed to remove or relocate existing directory for \"{:s}\": {:s}".format(
manifest.id,
error,