summaryrefslogtreecommitdiff
diff options
-rwxr-xr-xbin/gst_pipeline_test8
-rw-r--r--debian/.git-dpm14
-rwxr-xr-xmanage.py2
3 files changed, 12 insertions, 12 deletions
diff --git a/bin/gst_pipeline_test b/bin/gst_pipeline_test
index 4d9f3c4..f6b6703 100755
--- a/bin/gst_pipeline_test
+++ b/bin/gst_pipeline_test
@@ -17,14 +17,14 @@ from subprocess import check_output
def check_state(device):
"""Checks whether the sink is available for the given device.
"""
- sink_info = check_output(['pacmd', 'list-sinks'],
+ sink_info = check_output(['pactl', 'list', 'sinks'],
universal_newlines=True)
data = sink_info.split("\n")
try:
- device_name = re.findall(".*name:\s.*%s.*" % device, sink_info)[0].lstrip()
- sink = re.findall(".*name:\s<(.*%s.*)>" % device, sink_info)[0].lstrip()
- status = data[data.index("\t" + device_name) + 3]
+ device_name = re.findall(".*Name:\s.*%s.*" % device, sink_info)[0].lstrip()
+ sink = re.findall(".*Name:\s(.*%s.*)" % device, sink_info)[0].lstrip()
+ status = data[data.index("\t" + device_name) - 1]
except (IndexError, ValueError):
logging.error("Failed to find status for device: %s" % device)
return False
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 893d5c4..b7d0f3b 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
# see git-dpm(1) from git-dpm package
-0ea5ae58375181992cbca691dc9bb35db71a6e67
-0ea5ae58375181992cbca691dc9bb35db71a6e67
-0ea5ae58375181992cbca691dc9bb35db71a6e67
-0ea5ae58375181992cbca691dc9bb35db71a6e67
-plainbox-provider-checkbox_0.48.0~rc1.orig.tar.gz
-922820451d85860ea959b614aabfb6e2ec02a1eb
-1942548
+e78e8e86240c00fe003b7e7a93834567edd14061
+e78e8e86240c00fe003b7e7a93834567edd14061
+e78e8e86240c00fe003b7e7a93834567edd14061
+e78e8e86240c00fe003b7e7a93834567edd14061
+plainbox-provider-checkbox_0.48.0~rc2.orig.tar.gz
+727d5a7bf8d748960fa8afc62a2b89ead558dcef
+1942623
diff --git a/manage.py b/manage.py
index 1f5070b..f00a334 100755
--- a/manage.py
+++ b/manage.py
@@ -5,7 +5,7 @@ from plainbox.provider_manager import N_
setup(
name='plainbox-provider-checkbox',
namespace='com.canonical.certification',
- version="0.48.0rc1",
+ version="0.48.0rc2",
description=N_("Checkbox provider"),
gettext_domain='plainbox-provider-checkbox',
strict=False, deprecated=False,