Skip to content

Commit

Permalink
fix filtering for R dep variant specific to Python 2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
boegel committed Dec 13, 2018
1 parent 73addfb commit f32abd6
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions test/easyconfigs/easyconfigs.py
Expand Up @@ -207,14 +207,14 @@ def check_dep_vars(dep, dep_vars):
if len(dep_vars) == 1:
break

# filter R dep for a specific version of Python 2.x
elif dep == 'R' and len(dep_vars) > 1:
for key in dep_vars.keys():
if '; versionsuffix: -Python-2' in key:
dep_vars.pop(key)
# always retain at least one variant
if len(dep_vars) == 1:
break
# filter R dep for a specific version of Python 2.x
if dep == 'R' and len(dep_vars) > 1:
for key in dep_vars.keys():
if '; versionsuffix: -Python-2' in key:
dep_vars.pop(key)
# always retain at least one variant
if len(dep_vars) == 1:
break

# filter out Java 'wrapper'
# i.e. if the version of one is a prefix of the version of the other one (e.g. 1.8 & 1.8.0_181)
Expand Down

0 comments on commit f32abd6

Please sign in to comment.