Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions easybuild/framework/easyblock.py
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,22 @@ def collect_exts_file_info(self, fetch_files=True, verify_checksums=True):
def obtain_file(self, filename, extension=False, urls=None, download_filename=None, force_download=False,
git_config=None, no_download=False, download_instructions=None, alt_location=None,
warning_only=False):
try:
return self.obtain_file_and_fail(filename, extension, urls, download_filename, force_download, git_config,
no_download, download_instructions, alt_location, warning_only)
except Exception:
if build_option('fetch_continue'):
if not urls:
urls = ['NO_URL']
print_warning(f"FAILED: File {filename} not found from {urls[0]}. Continuing ...")
return 'NO_FILE_FOUND'
else:
raise

@_obtain_file_update_progress_bar_on_return
def obtain_file_and_fail(self, filename, extension=False, urls=None, download_filename=None, force_download=False,
git_config=None, no_download=False, download_instructions=None, alt_location=None,
warning_only=False):
"""
Locate the file with the given name
- searches in different subdirectories of source path
Expand Down
2 changes: 1 addition & 1 deletion easybuild/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ def process_eb_args(eb_args, eb_go, cfg_settings, modtool, testing, init_session

# build software, will exit when errors occurs (except when testing)
if not testing or (testing and do_build):
exit_on_failure = not (options.dump_test_report or options.upload_test_report)
exit_on_failure = not (options.dump_test_report or options.upload_test_report or build_option('fetch_continue'))

with rich_live_cm():
run_hook(PRE_PREF + BUILD_AND_INSTALL_LOOP, hooks, args=[ordered_ecs])
Expand Down
1 change: 1 addition & 0 deletions easybuild/tools/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ def mk_full_default_path(name, prefix=DEFAULT_PREFIX):
'experimental',
'extended_dry_run',
'fail_on_mod_files_gcccore',
'fetch_continue',
'force',
'generate_devel_module',
'group_writable_installdir',
Expand Down
3 changes: 3 additions & 0 deletions easybuild/tools/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,7 @@ def override_options(self):
False),
'fetch': ("Allow downloading sources ignoring OS and modules tool dependencies, "
"implies --stop=fetch, --ignore-osdeps and ignore modules tool", None, 'store_true', False),
'fetch-continue': ("Continue after failed fetch", None, 'store_true', False),
'filter-deps': ("List of dependencies that you do *not* want to install with EasyBuild, "
"because equivalent OS packages are installed. (e.g. --filter-deps=zlib,ncurses)",
'strlist', 'extend', None),
Expand Down Expand Up @@ -1359,6 +1360,8 @@ def _postprocess_config(self):
self.options.search_paths = [os.path.abspath(path) for path in self.options.search_paths]

# Fetch option implies stop=fetch, no moduletool and ignore-osdeps
if self.options.fetch_continue:
self.options.fetch = True
if self.options.fetch:
self.options.stop = FETCH_STEP
self.options.ignore_locks = True
Expand Down