Skip to content

Commit b844b7f

Browse files
author
Alan O'Cais
committed
Make find_potential_version_mappings quiet when it is just figuring out versionsuffix mappings
1 parent 8e3a5da commit b844b7f

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

easybuild/framework/easyconfig/tweak.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ def map_common_versionsuffixes(software_name, original_toolchain, toolchain_mapp
904904
'versionsuffix': versionsuffix or '',
905905
}
906906
# See what this dep would be mapped to
907-
version_matches = find_potential_version_mappings(software_as_dep, toolchain_mapping)
907+
version_matches = find_potential_version_mappings(software_as_dep, toolchain_mapping, quiet=True)
908908
if version_matches:
909909
target_version = version_matches[0]['version']
910910
if LooseVersion(target_version) > LooseVersion(version):
@@ -1101,7 +1101,7 @@ def list_deps_versionsuffixes(ec_spec):
11011101

11021102

11031103
def find_potential_version_mappings(dep, toolchain_mapping, versionsuffix_mapping=None, highest_versions_only=True,
1104-
ignore_versionsuffixes=False):
1104+
ignore_versionsuffixes=False, quiet=False):
11051105
"""
11061106
Find potential version mapping for a dependency in a new hierarchy
11071107
@@ -1220,10 +1220,11 @@ def find_potential_version_mappings(dep, toolchain_mapping, versionsuffix_mappin
12201220
if ignore_versionsuffixes:
12211221
highest_version = highest_version_ignoring_versionsuffix
12221222
else:
1223-
print_warning(
1224-
"There may be newer version(s) of dep '%s' available with a different versionsuffix to '%s': %s",
1225-
dep['name'], versionsuffix, [d['path'] for d in potential_version_mappings if
1226-
d['version'] == highest_version_ignoring_versionsuffix])
1223+
if not quiet:
1224+
print_warning(
1225+
"There may be newer version(s) of dep '%s' available with a different versionsuffix to '%s': %s",
1226+
dep['name'], versionsuffix, [d['path'] for d in potential_version_mappings if
1227+
d['version'] == highest_version_ignoring_versionsuffix])
12271228
# exclude candidates with a different versionsuffix
12281229
exclude_alternate_versionsuffixes = True
12291230
else:

0 commit comments

Comments
 (0)