Skip to content

restore 'download_source_path' and 'search_source_paths' argument for ConfigureMake.obtain_config_guess, but deprecate their use #4

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
Flamefire merged 2 commits into from
May 18, 2020
Merged

restore 'download_source_path' and 'search_source_paths' argument for ConfigureMake.obtain_config_guess, but deprecate their use #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f4d6a9
minor logic cleanup in RPackage.update_config_guess
boegel May 18, 2020
94238be
restore 'download_source_path' and 'search_source_paths' argument for…
boegel May 18, 2020
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
41 changes: 26 additions & 15 deletions easybuild/easyblocks/generic/configuremake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def check_config_guess(config_guess):
:param config_guess: Path to config.guess script to check
:return: Whether the script is valid (matches the version and checksum)
"""
log = fancylogger.getLogger('config.guess')
log = fancylogger.getLogger('check_config_guess')

# config.guess includes a "timestamp='...'" indicating the version
config_guess_version = None
Expand All @@ -94,28 +94,41 @@ def check_config_guess(config_guess):

result = True

# check version & SHA256 checksum before declaring victory
if config_guess_version != CONFIG_GUESS_VERSION:
result = False
tup = (config_guess, config_guess_version, CONFIG_GUESS_VERSION)
log.warning("config.guess version at %s does not match expected version: %s vs %s" % tup)
log.warning("config.guess version at %s does not match expected version: %s vs %s",
config_guess, config_guess_version, CONFIG_GUESS_VERSION)

elif config_guess_checksum != CONFIG_GUESS_SHA256:
result = False
tup = (config_guess, config_guess_checksum, CONFIG_GUESS_SHA256)
log.warning("SHA256 checksum of config.guess at %s does not match expected checksum: %s vs %s" % tup)
log.warning("SHA256 checksum of config.guess at %s does not match expected checksum: %s vs %s",
config_guess, config_guess_checksum, CONFIG_GUESS_SHA256)

return result


def obtain_config_guess():
def obtain_config_guess(download_source_path=None, search_source_paths=None):
"""
Locate or download an up-to-date config.guess

:param download_source_path: Path to download config.guess to
:param search_source_paths: Paths to search for config.guess
:return: Path to config.guess or None
"""
log = fancylogger.getLogger('config.guess')
log = fancylogger.getLogger('obtain_config_guess')

eb_source_paths = source_paths()

if download_source_path is None:
download_source_path = eb_source_paths[0]
else:
log.deprecated("Specifying custom source path to download config.guess via 'download_source_path'", '5.0')

search_source_paths = source_paths()
download_source_path = search_source_paths[0]
if search_source_paths is None:
search_source_paths = eb_source_paths
else:
log.deprecated("Specifying custom location to search for updated config.guess via 'search_source_paths'", '5.0')

config_guess = 'config.guess'
sourcepath_subdir = os.path.join('generic', 'eb_v%s' % EASYBLOCKS_VERSION, 'ConfigureMake')
Expand Down Expand Up @@ -182,17 +195,15 @@ def __init__(self, *args, **kwargs):

self.config_guess = None

def obtain_config_guess(self, *args, **kwargs):
def obtain_config_guess(self, download_source_path=None, search_source_paths=None):
"""
Locate or download an up-to-date config.guess for use with ConfigureMake

No arguments allowed
:param download_source_path: Path to download config.guess to
:param search_source_paths: Paths to search for config.guess
:return: Path to config.guess or None
"""
if args or kwargs:
self.log.nosupport("Support for passing arguments to 'obtain_config_guess' has been removed "
"and 'source_paths' will always be used", '4.2.1')
return obtain_config_guess()
return obtain_config_guess(download_source_path=download_source_path, search_source_paths=search_source_paths)

def check_config_guess(self):
"""Check timestamp & SHA256 checksum of config.guess script."""
Expand Down
9 changes: 5 additions & 4 deletions easybuild/easyblocks/generic/rpackage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,11 @@ def update_config_guess(self, path):
config_guess = os.path.join(config_guess_dir, 'config.guess')
if not check_config_guess(config_guess):
updated_config_guess = obtain_config_guess()
if not updated_config_guess:
raise EasyBuildError('Failed to obtain updated config.guess')
self.log.debug("Replacing outdated %s with more recent copy at %s", config_guess, updated_config_guess)
copy_file(updated_config_guess, config_guess)
if updated_config_guess:
self.log.debug("Replacing outdated %s with more recent %s", config_guess, updated_config_guess)
copy_file(updated_config_guess, config_guess)
else:
raise EasyBuildError("Failed to obtain updated config.guess")

def install_step(self):
"""Install procedure for R packages."""
Expand Down