Skip to content

Commit f905cde

Browse files
committed
add support for specifying custom name to use when checking accepted EULA
1 parent 3536ac7 commit f905cde

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

easybuild/framework/easyblock.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1636,12 +1636,15 @@ def guess_start_dir(self):
16361636
change_dir(self.start_dir)
16371637
self.log.debug("Changed to real build directory %s (start_dir)", self.start_dir)
16381638

1639-
def check_accepted_eula(self, more_info=None):
1639+
def check_accepted_eula(self, name=None, more_info=None):
16401640
"""Check whether EULA for this software is accepted in current EasyBuild configuration."""
16411641

1642+
if name is None:
1643+
name = self.name
1644+
16421645
accepted_eulas = build_option('accept_eula') or []
1643-
if self.cfg['accept_eula'] or self.name in accepted_eulas:
1644-
self.log.info("EULA for %s is accepted", self.name)
1646+
if self.cfg['accept_eula'] or name in accepted_eulas:
1647+
self.log.info("EULA for %s is accepted", name)
16451648
else:
16461649
error_lines = [
16471650
"The End User License Argreement (EULA) for %(name)s is currently not accepted!",
@@ -1656,7 +1659,7 @@ def check_accepted_eula(self, more_info=None):
16561659
"- add 'accept_eula = True' to the easyconfig file you are using;",
16571660
'',
16581661
])
1659-
raise EasyBuildError('\n'.join(error_lines) % {'name': self.name})
1662+
raise EasyBuildError('\n'.join(error_lines) % {'name': name})
16601663

16611664
def handle_iterate_opts(self):
16621665
"""Handle options relevant during iterated part of build/install procedure."""

0 commit comments

Comments
 (0)