Skip to content
Snippets Groups Projects
Commit 15f67e43 authored by Studer Gabriel's avatar Studer Gabriel
Browse files

fix regular expression to determine BLAST version

Some BLAST version have a leading whitespace, the regex didn't match
in those cases. Thanks to Andrius Merkys for the proposed fix.
parent f503f663
No related branches found
No related tags found
No related merge requests found
...@@ -186,11 +186,11 @@ def BlastVersion(blast_location=None): ...@@ -186,11 +186,11 @@ def BlastVersion(blast_location=None):
if os.path.basename(blast_exe)=='blastall': if os.path.basename(blast_exe)=='blastall':
args=[blast_exe] args=[blast_exe]
pattern=re.compile(r'blastall (\d+\.\d+\.\d+)\s+arguments:\s*') pattern=re.compile(r'\s*blastall (\d+\.\d+\.\d+)\s+arguments:\s*')
else: else:
args=[blast_exe, '-version'] args=[blast_exe, '-version']
pattern=re.compile(r'Package: blast (\d+\.\d+\.\d+),\s+') pattern=re.compile(r'\s*Package: blast (\d+\.\d+\.\d+),\s+')
blast_pipe=subprocess.Popen(args, stdout=subprocess.PIPE, blast_pipe=subprocess.Popen(args, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment