Merge lp:~laney/ubuntu-system-settings/migration-script-no-crash into lp:ubuntu-system-settings

[Iain Lane]

Don't crash if the migration script can't set values

If you're not authorised to write to AS, the migration script crashes. There's not a lot we can do to rectify the situation, but fix the crash by catching it and writing an error.

Actually, we don't have error handling in u-s-s for this case either. It's not massively urgent to fix - this is quite niche & we don't have a generic 'error state' which we'd want to use.

Put something like this in a pkla file & then run the script to repro this bug

[NO]
Identity=unix-user:laney
Action=org.freedesktop.accounts.change-own-user-data
ResultActive=no

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:644
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~laney/ubuntu-system-settings/migration-script-no-crash/+merge/210005/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/684/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3760
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3348
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3768
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3768/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3350
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3350/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5719
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4592

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/684/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

ok!

review: Approve

=== modified file 'debian/ubuntu-system-settings-sound-gsettings-to-accountsservice.py' (properties changed: -x to +x)
--- debian/ubuntu-system-settings-sound-gsettings-to-accountsservice.py	2014-01-09 13:02:44 +0000
+++ debian/ubuntu-system-settings-sound-gsettings-to-accountsservice.py	2014-03-07 19:41:04 +0000
@@ -23,6 +23,7 @@
  
 import dbus
 import os
+import sys
 
 from gi.repository import Gio
 
@@ -42,8 +43,11 @@
     return gsettings.get_boolean(key)
 
 def set_as_setting(interface, setting, value):
-    user_proxy.Set(interface, setting, value, 
-                   dbus_interface=dbus.PROPERTIES_IFACE)
+    try:
+        user_proxy.Set(interface, setting, value, 
+                       dbus_interface=dbus.PROPERTIES_IFACE)
+    except dbus.exceptions.DBusException as e:
+        print("Couldn't update %s: %s" % (setting, e), file=sys.stderr) 
 
 # (gsettings key, accountsservice key, function to retrieve from gsettings)
 keys = [('silent-mode', 'SilentMode', get_bool),