r41222 - in /desktop/experimental/gnome-shell/debian: changelog patches/41-handle-logind-fail.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Apr  3 17:30:47 2014
New Revision: 41222

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41222
Log:
* debian/patches/41-handle-logind-fail.patch:
  + Gracefully handle logind not creating our session by falling back
    to ConsoleKit. This can happen when running on a kernel without
    cgroups support. Closes: #729877. Patch originally applied to
    3.8.4-5 but still relevant.

Added:
    desktop/experimental/gnome-shell/debian/patches/41-handle-logind-fail.patch
Modified:
    desktop/experimental/gnome-shell/debian/changelog
    desktop/experimental/gnome-shell/debian/patches/series

Modified: desktop/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/changelog?rev=41222&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog	[utf-8] Thu Apr  3 17:30:47 2014
@@ -34,9 +34,15 @@
   [ Emilio Pozuelo Monfort ]
   * debian/control.in:
     + Bump gir1.2-mutter-3.0 dependency to >= 3.12.
+  * debian/patches/41-handle-logind-fail.patch:
+    + Gracefully handle logind not creating our session by falling back
+      to ConsoleKit. This can happen when running on a kernel without
+      cgroups support. Closes: #729877. Patch originally applied to
+      3.8.4-5 but still relevant.
 
   [ Pedro Beja ]
   * Update package description (Closes: #689183)
+
 
  -- Andreas Henriksson <andreas at fatal.se>  Thu, 03 Apr 2014 19:22:10 +0200
 

Added: desktop/experimental/gnome-shell/debian/patches/41-handle-logind-fail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/41-handle-logind-fail.patch?rev=41222&op=file
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/41-handle-logind-fail.patch	(added)
+++ desktop/experimental/gnome-shell/debian/patches/41-handle-logind-fail.patch	[utf-8] Thu Apr  3 17:30:47 2014
@@ -0,0 +1,22 @@
+Author: Emilio Pozuelo Monfort <pochu at debian.org>
+
+Even if logind is running (which is what haveSystemd() is checking), it may
+fail to create a session, e.g. if the kernel doesn't have cgroups support.
+
+If that's the case, XDG_SESSION_ID will not be set and we will fail to
+start. Thus talk to logind if XDG_SESSION_ID is set, which is a sign that
+logind actually created our session. Otherwise, fall back to ConsoleKit.
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=729877
+
+--- a/js/misc/loginManager.js
++++ b/js/misc/loginManager.js
+@@ -117,7 +117,7 @@
+  */
+ function getLoginManager() {
+     if (_loginManager == null) {
+-        if (haveSystemd())
++        if (haveSystemd() && GLib.getenv('XDG_SESSION_ID'))
+             _loginManager = new LoginManagerSystemd();
+         else
+             _loginManager = new LoginManagerConsoleKit();

Modified: desktop/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/series?rev=41222&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series	[utf-8] Thu Apr  3 17:30:47 2014
@@ -1,4 +1,5 @@
 #10-make-NetworkManager-optional.patch
 27-nm-libexec-path.patch
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
+41-handle-logind-fail.patch
 42-Specifically-ask-for-Telepathy-0.x.patch