Skip to content

Commit

Permalink
address review
Browse files Browse the repository at this point in the history
  • Loading branch information
branfosj committed Apr 30, 2024
1 parent 2724c8e commit 0a5c99f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
3 changes: 2 additions & 1 deletion easybuild/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
from easybuild.framework.easyconfig.tools import det_easyconfig_paths, dump_env_script, get_paths_for
from easybuild.framework.easyconfig.tools import parse_easyconfigs, review_pr, run_contrib_checks, skip_available
from easybuild.framework.easyconfig.tweak import obtain_ec_for, tweak
from easybuild.tools.build_log import print_warning
from easybuild.tools.config import find_last_log, get_repository, get_repositorypath, build_option
from easybuild.tools.containers.common import containerize
from easybuild.tools.docs import list_software
Expand Down Expand Up @@ -621,7 +622,7 @@ def main(args=None, logfile=None, do_build=None, testing=False, modtool=None, pr

# compare running Framework and EasyBlocks versions
if EASYBLOCKS_VERSION == UNKNOWN_VERSION:
print_msg("Unable to determine EasyBlocks version, so we'll assume it is not different from Framework")
print_warning("Unable to determine EasyBlocks version, so we'll assume it is not different from Framework")
elif different_major_versions(FRAMEWORK_VERSION, EASYBLOCKS_VERSION):
raise EasyBuildError("Framework (%s) and EasyBlock (%s) major versions are different." % (FRAMEWORK_VERSION,
EASYBLOCKS_VERSION))
Expand Down
8 changes: 3 additions & 5 deletions easybuild/tools/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,9 @@ def this_is_easybuild():
def different_major_versions(v1, v2):
"""Compare major versions"""
# Deal with version instances being either strings or LooseVersion
if not isinstance(v1, LooseVersion):
if isinstance(v1, str):
v1 = LooseVersion(v1)
if not isinstance(v2, LooseVersion):
if isinstance(v2, str):
v2 = LooseVersion(v2)

if v1.version[0] == v2.version[0]:
return False
return True
return v1.version[0] != v2.version[0]

0 comments on commit 0a5c99f

Please sign in to comment.