Merge lp:~thekorn/ubuntu/lucid/update-manager/bug-539211-on_battery into lp:ubuntu/lucid/update-manager

[Markus Korn]

Modified UpdateManager.Core.utils.on_battery() to use UPower per default
(and DeviceKit.Power as fallback) to check if a system is running on battery
(LP: #539211)

[James Westby (james-w)]

Looks good to me.

Michael, would you review too please?

Thanks,

James

review: Approve

[Michael Vogt (mvo)]

Thanks, this was merged a while ago:

update-manager (1:0.133.5) lucid; urgency=low

  [ Markus Korn ]
  * UpdateManager/Core/utils.py:
    - Modified UpdateManager.Core.utils.on_battery() to use UPower per default
      (and DeviceKit.Power as fallback) to check if a system is running
      on battery (LP: #539211)
...

review: Approve

=== modified file 'UpdateManager/Core/utils.py'
--- UpdateManager/Core/utils.py	2010-01-27 12:00:53 +0000
+++ UpdateManager/Core/utils.py	2010-03-15 19:34:16 +0000
@@ -209,16 +209,25 @@
 
 def on_battery():
   """
-  Check a dbus signal to org.gnome.PowerManager to not suspend
-  the system, this is to support upgrades from pre-gutsy g-p-m
+  Check via dbus if the system is running on battery.
+  This function is using UPower per default, if UPower is not
+  available it falls-back to DeviceKit.Power. 
   """
   try:
     import dbus
     bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
-    devobj = bus.get_object('org.freedesktop.DeviceKit.Power', 
-                            '/org/freedesktop/DeviceKit/Power')
-    dev = dbus.Interface(devobj, "org.freedesktop.DBus.Properties")
-    return dev.Get("org.freedesktop.DeviceKit.Power", "on_battery")
+    try:
+        devobj = bus.get_object('org.freedesktop.UPower', 
+                                '/org/freedesktop/UPower')
+        dev = dbus.Interface(devobj, 'org.freedesktop.DBus.Properties')
+        return dev.Get('org.freedesktop.UPower', 'OnBattery')
+    except dbus.exceptions.DBusException, e:
+        if e._dbus_error_name != 'org.freedesktop.DBus.Error.ServiceUnknown':
+            raise
+        devobj = bus.get_object('org.freedesktop.DeviceKit.Power', 
+                                '/org/freedesktop/DeviceKit/Power')
+        dev = dbus.Interface(devobj, "org.freedesktop.DBus.Properties")
+        return dev.Get("org.freedesktop.DeviceKit.Power", "on_battery")
   except Exception, e:
     #import sys
     #print >>sys.stderr, "on_battery returned error: ", e