Skip to content

Commit

Permalink
Merge pull request #2597 from akesandgren/20211012145549_new_pr_opens…
Browse files Browse the repository at this point in the history
…sl_wrapper

openssl_wrapper easyblock version regex is too specific, the version string does not always end with a letter.
  • Loading branch information
boegel authored Oct 13, 2021
2 parents 1e441fa + 923c01a commit b818b88
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions easybuild/easyblocks/o/openssl_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ def __init__(self, *args, **kwargs):
raise EasyBuildError(err_msg, min_openssl_version, self.version)

# Regex pattern to find version strings in OpenSSL libraries and headers
full_version_regex = re.compile(r'[0-9]+\.[0-9]+\.[0-9]+[a-z]')
openssl_version_regex = re.compile(r'OpenSSL\s+([0-9]+\.[0-9]+(\.[0-9]+[a-z])*)', re.M)
full_version_regex = re.compile(r'[0-9]+\.[0-9]+\.[0-9]+[a-z]?')
openssl_version_regex = re.compile(r'OpenSSL\s+([0-9]+\.[0-9]+(\.[0-9]+[a-z]?)*)', re.M)

# Libraries packaged in OpenSSL
openssl_libs = ['libssl', 'libcrypto']
Expand Down

0 comments on commit b818b88

Please sign in to comment.