Skip to content

Commit

Permalink
Merge pull request #673 from boegel/intelbase_move_home_intel
Browse files Browse the repository at this point in the history
move preparing of 'intel' subdir in $HOME to configure_step
  • Loading branch information
boegel committed Aug 27, 2015
2 parents 63b4472 + ef552de commit 7a8ef65
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions easybuild/easyblocks/generic/intelbase.py
Expand Up @@ -91,10 +91,6 @@ def __init__(self, *args, **kwargs):
common_tmp_dir = os.path.dirname(tempfile.gettempdir()) # common tmp directory, same across nodes
self.home_subdir_local = os.path.join(common_tmp_dir, os.getenv('USER'), 'easybuild_intel')

# prepare (local) 'intel' home subdir
self.setup_local_home_subdir()
self.clean_home_subdir()

@staticmethod
def extra_options(extra_vars=None):
extra_vars = EasyBlock.extra_options(extra_vars)
Expand Down Expand Up @@ -165,6 +161,10 @@ def setup_local_home_subdir(self):
def configure_step(self):
"""Configure: handle license file and clean home dir."""

# prepare (local) 'intel' home subdir
self.setup_local_home_subdir()
self.clean_home_subdir()

lic_env_var = None # environment variable that will be used
default_lic_env_var = 'INTEL_LICENSE_FILE'
lic_env_vars = [default_lic_env_var, 'LM_LICENSE_FILE']
Expand Down

0 comments on commit 7a8ef65

Please sign in to comment.