Skip to content

remove deprecated log_error option from which function #4276

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

Merged
boegel merged 2 commits into from
Sep 6, 2023
Merged

remove deprecated log_error option from which function #4276

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3acae5
remove deprecated log_error option from which command
branfosj Jun 11, 2023
2e2e328
actually remove the option
branfosj Jun 11, 2023
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
13 changes: 1 addition & 12 deletions easybuild/tools/filetools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ def extract_file(fn, dest, cmd=None, extra_options=None, overwrite=False, forced
return base_dir


def which(cmd, retain_all=False, check_perms=True, log_ok=True, log_error=None, on_error=None):
def which(cmd, retain_all=False, check_perms=True, log_ok=True, on_error=WARN):
"""
Return (first) path in $PATH for specified command, or None if command is not found

Expand All @@ -493,17 +493,6 @@ def which(cmd, retain_all=False, check_perms=True, log_ok=True, log_error=None,
:param log_ok: Log an info message where the command has been found (if any)
:param on_error: What to do if the command was not found, default: WARN. Possible values: IGNORE, WARN, ERROR
"""
if log_error is not None:
_log.deprecated("'log_error' named argument in which function has been replaced by 'on_error'", '5.0')
# If set, make sure on_error is at least WARN
if log_error and on_error == IGNORE:
on_error = WARN
elif not log_error and on_error is None: # If set to False, use IGNORE unless on_error is also set
on_error = IGNORE
# Set default
# TODO: After removal of log_error from the parameters, on_error=WARN can be used instead of this
if on_error is None:
on_error = WARN
if on_error not in (IGNORE, WARN, ERROR):
raise EasyBuildError("Invalid value for 'on_error': %s", on_error)

Expand Down