Merge lp:~sylvain-pineau/checkbox/fix-1460556 into lp:checkbox

[Sylvain Pineau]

Fixes the linked bug by fixing pactl commands and regexp in checkbox-support audio_settings script.

Tested ok on both 14.04.1 and 15.04

[Daniel Manrique (roadmr)]

+1, good catch.

review: Approve

=== modified file 'checkbox-support/checkbox_support/scripts/audio_settings.py'
--- checkbox-support/checkbox_support/scripts/audio_settings.py	2014-08-07 20:38:27 +0000
+++ checkbox-support/checkbox_support/scripts/audio_settings.py	2015-06-08 17:01:54 +0000
@@ -38,7 +38,7 @@
 default_pattern = "(?<=Default %s: ).*"
 index_regex = re.compile("(?<=index: )[0-9]*")
 muted_regex = re.compile("(?<=Mute: ).*")
-volume_regex = re.compile("(?<=Volume: 0:)\s*[0-9]*")
+volume_regex = re.compile("Volume: (?:0|front-left):\s*([0-9])*")
 name_regex = re.compile("(?<=Name:).*")
 
 entry_pattern = "Name: %s.*?(?=Properties)"
@@ -210,7 +210,7 @@
         sys.exit(1)
 
     for type in TYPES:
-        pactl_status = check_output(["pactl", "stat"],
+        pactl_status = check_output(["pactl", "info"],
                                     universal_newlines=True,
                                     env=unlocalized_env())
         default_regex = re.compile(default_pattern % type.title())
@@ -229,7 +229,7 @@
         print("%s_muted: %s" % (type, muted.group().strip()),
               file=settings_file)
 
-        volume = int(volume_regex.search(entry).group().strip())
+        volume = int(volume_regex.search(entry).group(1).strip())
 
         print("%s_volume: %s%%" % (type, str(volume)),
               file=settings_file)