CC-3838: Exception in "airtime-test-stream"

-fixed
This commit is contained in:
Martin Konecny 2012-05-16 17:26:18 -04:00
parent 105d752ada
commit 9ed4ca4259
2 changed files with 4 additions and 10 deletions

View File

@ -29,12 +29,9 @@ def find_liquidsoap_binary():
the location of this binary.
"""
rv = subprocess.call("which liquidsoap > /dev/null", shell=True)
rv = subprocess.call("which airtime-liquidsoap > /dev/null", shell=True)
if rv == 0:
return "liquidsoap"
else:
if os.path.exists("/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap"):
return "/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap"
return "airtime-liquidsoap"
return None

View File

@ -33,12 +33,9 @@ def find_liquidsoap_binary():
the location of this binary.
"""
rv = subprocess.call("which liquidsoap > /dev/null", shell=True)
rv = subprocess.call("which airtime-liquidsoap > /dev/null", shell=True)
if rv == 0:
return "liquidsoap"
else:
if os.path.exists("/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap"):
return "/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap"
return "airtime-liquidsoap"
return None