Skip to content

fix handling of broken symlinks in filetools.remove #4921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ocaisa merged 1 commit into from
Jun 16, 2025
Merged

fix handling of broken symlinks in filetools.remove #4921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion easybuild/tools/filetools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ def remove(paths):
_log.info("Removing %d files & directories", len(paths))

for path in paths:
if os.path.isfile(path):
if os.path.isfile(path) or os.path.islink(path):
remove_file(path)
elif os.path.isdir(path):
remove_dir(path)
Expand Down
12 changes: 12 additions & 0 deletions test/framework/filetools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2555,12 +2555,24 @@ def test_remove(self):
"""Test remove_file, remove_dir and join remove functions."""
testfile = os.path.join(self.test_prefix, 'foo')
test_dir = os.path.join(self.test_prefix, 'test123')
test_link = os.path.join(self.test_prefix, 'foolink')

for remove_file_function in (ft.remove_file, ft.remove):
ft.write_file(testfile, 'bar')
self.assertExists(testfile)
# remove symlink
ft.symlink(testfile, test_link)
self.assertTrue(os.path.islink(test_link))
remove_file_function(test_link)
self.assertNotExists(test_link)
# remove file
remove_file_function(testfile)
self.assertNotExists(testfile)
# remove broken symlink
ft.symlink(testfile, test_link)
self.assertTrue(os.path.islink(test_link))
remove_file_function(test_link)
self.assertNotExists(test_link)

for remove_dir_function in (ft.remove_dir, ft.remove):
ft.mkdir(test_dir)
Expand Down