Merge lp:~roadmr/checkbox/1065703-audio-settings into lp:checkbox

[Daniel Manrique]

This code ensures that the audio settings storage file contains the required values. If they're not present, we barf with a useful error message.

This code ensures that the audio settings storage file contains the required values. If they're not present, we barf with a useful error message. Note that I'm not validating the format of the stored data itself. Also, I'm sure this could be done in a more elegant way but I chose this way because it can also easily be adapted to a backport of the fix for 0.14.x.

[Zygmunt Krynicki (zyga)]

Thanks, +1

review: Approve

[Zygmunt Krynicki (zyga)]

Attempt to merge into lp:checkbox failed due to conflicts:

text conflict in debian/changelog

[Daniel Manrique (roadmr)]

Fixed changelog and resubmitting :)

review: Needs Resubmitting

[lp:~roadmr/checkbox/1065703-audio-settings]

1834. By Daniel Manrique on 2012-12-12

merged from trunk

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-12 09:48:07 +0000
+++ debian/changelog	2012-12-12 14:39:21 +0000
@@ -2,6 +2,8 @@
 
   [ Daniel Manrique ]
   * New version 0.15 for Raring Ringtail development.
+  * Fail gracefully with a friendly and useful error message if audio settings
+    file format is invalid. (LP: #1065703)
   * Added environ key to poweroff and reboot jobs so they create logs in the
     expected location (LP: #1085833)
   * scripts/memory_compare: Fixed accumulator expression to give good results

=== modified file 'scripts/audio_settings'
--- scripts/audio_settings	2012-11-12 13:18:08 +0000
+++ scripts/audio_settings	2012-12-12 14:39:21 +0000
@@ -175,7 +175,16 @@
         sys.exit(1)
 
     for type in TYPES:
-        name = settings_file[settings_file.index("default_%s:" % type) + 1]
+        #First try to get the three elements we need. If we fail to get any of them, it means
+        #the file's format is incorrect, so we just abort.
+        try:
+            name = settings_file[settings_file.index("default_%s:" % type) + 1]
+            muted = settings_file[settings_file.index("%s_muted:" % type) + 1]
+            volume = settings_file[settings_file.index("%s_volume:" % type) + 1]
+        except ValueError:
+            print("Unable to restore settings because settings file is invalid")
+            sys.exit(1)
+
         print(name)
 
         try:
@@ -187,7 +196,6 @@
         if type == "sink":
             move_sinks(name)
 
-        muted = settings_file[settings_file.index("%s_muted:" % type) + 1]
         print(muted)
 
         try:
@@ -196,7 +204,6 @@
             print("Failed to set mute for %s" % device)
             sys.exit(1)
 
-        volume = settings_file[settings_file.index("%s_volume:" % type) + 1]
         print(volume)
 
         try: