From 9ed4ca42590c0e2b8385e5d7f3c2ce80f90170da Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 16 May 2012 17:26:18 -0400 Subject: [PATCH] CC-3838: Exception in "airtime-test-stream" -fixed --- utils/airtime-test-soundcard.py | 7 ++----- utils/airtime-test-stream.py | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/utils/airtime-test-soundcard.py b/utils/airtime-test-soundcard.py index 5d1ce95c9..5e23c6292 100644 --- a/utils/airtime-test-soundcard.py +++ b/utils/airtime-test-soundcard.py @@ -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 diff --git a/utils/airtime-test-stream.py b/utils/airtime-test-stream.py index 9e10a63a4..a2a1a0d2d 100644 --- a/utils/airtime-test-stream.py +++ b/utils/airtime-test-stream.py @@ -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