Skip to content

Commit

Permalink
Merge pull request #559 from broadinstitute/ct-conda-corrections
Browse files Browse the repository at this point in the history
add conda package version checking for newer conda versions
  • Loading branch information
tomkinsc committed Jan 18, 2017
2 parents d54df36 + eb92baa commit 59d9b54
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion tools/__init__.py
Expand Up @@ -475,7 +475,10 @@ def get_installed_version(self):
return # return rather than raise so we can fall back to the next install method

if data and len(data):
installed_package_string = data[0]
if isinstance(data[0], dict):
installed_package_string = data[0]["dist_name"]
else:
installed_package_string = data[0]
package_info_re = re.compile(r"(?P<package_name>.*)-(?P<version>.*)-(?P<build_type>.*)")
matches = package_info_re.match(installed_package_string)
if matches:
Expand Down

0 comments on commit 59d9b54

Please sign in to comment.