Merge lp:~nskaggs/update-manager/fix-for-702418 into lp:update-manager

[Nicholas Skaggs]

This is a fix for bug 702418. I added a check to prevent the calling the old dbus interface check for gnome-power-manager under any desktop environment that is not gnome. This will instead simply call the FreeDesktop powermanager without attempting the old check.

[Michael Vogt (mvo)]

Thanks for your branch!

Testing for gnome in the env is not quite sufficient as the default session will use
"XDG_CURRENT_DESKTOP=Unity" and DESKTOP_SESSION=ubuntu these days. Actually this makes
me wonder if calling the old interface can be dropped entirely? Could you maybe check
if gnome now supports the freedesktop one?

review: Needs Information

[Nicholas Skaggs (nskaggs)]

Michael, my idea in only checking for "gnome" was that only gnome 2.x
would need the old gnome dbus check. Unity and gnome shell both
support the the new freedesktop interace, as does kde and xfce and
lxde.

I'll go ahead and drop the old interface call completely and update
the branch. I will also attempt to confirm with the gnome developers
that we are free to drop legacy support. Thanks,

Nicholas

On Mon, Nov 7, 2011 at 4:16 AM, Michael Vogt <email address hidden> wrote:
> Review: Needs Information
>
> Thanks for your branch!
>
> Testing for gnome in the env is not quite sufficient as the default session will use
> "XDG_CURRENT_DESKTOP=Unity" and DESKTOP_SESSION=ubuntu these days. Actually this makes
> me wonder if calling the old interface can be dropped entirely? Could you maybe check
> if gnome now supports the freedesktop one?
> --
> https://code.launchpad.net/~nskaggs/update-manager/fix-for-702418/+merge/81298
> You are the owner of lp:~nskaggs/update-manager/fix-for-702418.
>

[Michael Vogt (mvo)]

Thanks Nocholas! I think dropping the old interface is indeed the best option. We just need to make sure that that works on lucid, but I bet it does :)

[lp:~nskaggs/update-manager/fix-for-702418]

2260. By Nicholas Skaggs on 2011-11-09

removed dbus interface completely and only use freedesktop interface

[Nicholas Skaggs (nskaggs)]

Pushed a commit that removed the old interface completely. Are we
wanting backport the fix to lucid or ?

Nicholas

On Tue, Nov 8, 2011 at 5:54 AM, Michael Vogt <email address hidden> wrote:
> Thanks Nocholas! I think dropping the old interface is indeed the best option. We just need to make sure that that works on lucid, but I bet it does :)
> --
> https://code.launchpad.net/~nskaggs/update-manager/fix-for-702418/+merge/81298
> You are the owner of lp:~nskaggs/update-manager/fix-for-702418.
>

Unmerged revisions

=== modified file 'UpdateManager/Core/utils.py'
--- UpdateManager/Core/utils.py	2011-11-07 14:29:56 +0000
+++ UpdateManager/Core/utils.py	2011-11-09 02:47:24 +0000
@@ -311,46 +311,22 @@
     #print >>sys.stderr, "on_battery returned error: ", e
     return False
 
-def _inhibit_sleep_old_interface():
-  """
-  Send a dbus signal to org.gnome.SettingsDaemon.Power to not suspend
-  the system, this is to support upgrades from pre-gutsy g-p-m
-  """
-  import dbus
-  bus = dbus.Bus(dbus.Bus.TYPE_SESSION)
-  devobj = bus.get_object('org.gnome.SettingsDaemon', 
-                          '/org/gnome/SettingsDaemon/Power')
-  dev = dbus.Interface(devobj, "org.gnome.SettingsDaemon.Power")
-  cookie = dev.Inhibit('UpdateManager', 'Updating system')
-  return (dev, cookie)
-
-def _inhibit_sleep_new_interface():
-  """
-  Send a dbus signal to gnome-power-manager to not suspend
-  the system
-  """
-  import dbus
-  bus = dbus.Bus(dbus.Bus.TYPE_SESSION)
-  devobj = bus.get_object('org.freedesktop.PowerManagement', 
-                          '/org/freedesktop/PowerManagement/Inhibit')
-  dev = dbus.Interface(devobj, "org.freedesktop.PowerManagement.Inhibit")
-  cookie = dev.Inhibit('UpdateManager', 'Updating system')
-  return (dev, cookie)
-
 def inhibit_sleep():
   """
   Send a dbus signal to power-manager to not suspend
-  the system, try both the new freedesktop and the
-  old gnome dbus interface
+  the system, using the freedesktop common interface
   """
   try:
-    return _inhibit_sleep_old_interface()
+    import dbus
+    bus = dbus.Bus(dbus.Bus.TYPE_SESSION)
+    devobj = bus.get_object('org.freedesktop.PowerManagement', 
+                          '/org/freedesktop/PowerManagement/Inhibit')
+    dev = dbus.Interface(devobj, "org.freedesktop.PowerManagement.Inhibit")
+    cookie = dev.Inhibit('UpdateManager', 'Updating system')
+    return (dev, cookie)
   except Exception:
-    try:
-      return _inhibit_sleep_new_interface()
-    except Exception:
-      #print "could not send the dbus Inhibit signal: %s" % e
-      return (False, False)
+    #print "could not send the dbus Inhibit signal: %s" % e
+    return (False, False)
 
 def allow_sleep(dev, cookie):
   """Send a dbus signal to gnome-power-manager to allow a suspending