Skip to content

Commit 54f5db1

Browse files
authored
Merge pull request #3928 from smoors/20250915153650_new_pr_java
use `clean_dir` instead of `remove_dir` on installation directory in custom easyblock for Java
2 parents 07d2459 + d037ab0 commit 54f5db1

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

easybuild/easyblocks/j/java.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from easybuild.easyblocks.generic.packedbinary import PackedBinary
3737
from easybuild.tools.build_log import EasyBuildError
3838
from easybuild.tools.config import build_option
39-
from easybuild.tools.filetools import adjust_permissions, change_dir, copy_dir, copy_file, remove_dir, which
39+
from easybuild.tools.filetools import adjust_permissions, change_dir, clean_dir, copy_dir, copy_file, which
4040
from easybuild.tools.run import run_shell_cmd
4141
from easybuild.tools.systemtools import AARCH64, POWER, RISCV64, X86_64, get_cpu_architecture, get_shared_lib_ext
4242
from easybuild.tools.utilities import nub
@@ -82,8 +82,8 @@ def extract_step(self):
8282
def install_step(self):
8383
"""Custom install step: just copy unpacked installation files."""
8484
if LooseVersion(self.version) < LooseVersion('1.7'):
85-
remove_dir(self.installdir)
86-
copy_dir(os.path.join(self.builddir, 'jdk%s' % self.version), self.installdir)
85+
clean_dir(self.installdir)
86+
copy_dir(os.path.join(self.builddir, 'jdk%s' % self.version), self.installdir, dirs_exist_ok=True)
8787
else:
8888
PackedBinary.install_step(self)
8989

0 commit comments

Comments
 (0)