Skip to content

use clean_dir instead of remove_dir on installation directory for Molpro easyblock #3930

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

Open
smoors wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

use clean_dir instead of remove_dir on installation directory for Molpro easyblock #3930

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
7 changes: 3 additions & 4 deletions easybuild/easyblocks/m/molpro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"""
import glob
import os
import shutil
import re

from easybuild.easyblocks.generic.binary import Binary
Expand All @@ -39,7 +38,7 @@
from easybuild.tools import LooseVersion
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.config import build_option
from easybuild.tools.filetools import apply_regex_substitutions, change_dir, mkdir, read_file, symlink
from easybuild.tools.filetools import apply_regex_substitutions, change_dir, clean_dir, mkdir, read_file, symlink
from easybuild.tools.run import run_shell_cmd


Expand Down Expand Up @@ -208,8 +207,8 @@ def install_step(self):

for src in self.src:
if LooseVersion(self.version) >= LooseVersion('2015'):
# install dir must be non-existent
shutil.rmtree(self.installdir)
# install dir must be non-existent or empty
clean_dir(self.installdir)
cmd = "./{0} -batch -prefix {1}".format(src['name'], self.installdir)
else:
cmd = "./{0} -batch -instbin {1}/bin -instlib {1}/lib".format(src['name'], self.installdir)
Expand Down