joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow digiham binaries to return their own name

Browse Source
This commit is contained in:
Jakob Ketterl 2021-05-28 00:02:20 +02:00
parent a16ad952c4
commit 9cd730dc9a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
owrx/feature.py
View File

@ -231,7 +231,7 @@ class FeatureDetector(object):
""" """
required_version = LooseVersion("0.3") required_version = LooseVersion("0.3")
digiham_version_regex = re.compile("^digiham version (.*)$") digiham_version_regex = re.compile("^(.*) version (.*)$")
def check_digiham_version(command): def check_digiham_version(command):
try: try:
@ -239,9 +239,9 @@ class FeatureDetector(object):
matches = digiham_version_regex.match(process.stdout.readline().decode()) matches = digiham_version_regex.match(process.stdout.readline().decode())
if matches is None: if matches is None:
return False return False
version = LooseVersion(matches.group(1)) version = LooseVersion(matches.group(2))
process.wait(1) process.wait(1)
return version >= required_version return matches.group(1) in [command, "digiham"] and version >= required_version
except FileNotFoundError: except FileNotFoundError:
return False return False