[25453] in Source-Commits
Re: /svn/athena r24995 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (Jonathan Reed)
Wed Mar 2 14:26:52 2011
Mime-Version: 1.0 (Apple Message framework v1082)
Content-Type: text/plain; charset=us-ascii
From: Jonathan Reed <jdreed@MIT.EDU>
In-Reply-To: <201103021902.p22J2DOF004046@drugstore.mit.edu>
Date: Wed, 2 Mar 2011 14:26:44 -0500
Cc: source-commits@mit.edu
Message-Id: <7AF5137C-1D9D-489E-817B-F01F4A5E6D3F@mit.edu>
To: Jonathan D Reed <jdreed@mit.edu>
Content-Transfer-Encoding: 8bit
If i can get an ACK on this (and r24996, which is just changelog updates) sooner rather than later, i'd like to push to development today and aim to get this out Monday night, since we're actively losing when people power-down a machine in the middle of an update because they can't log in.
-Jon
On Mar 2, 2011, at 2:02 PM, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2011-03-02 14:02:13 -0500 (Wed, 02 Mar 2011)
> New Revision: 24995
>
> Modified:
> trunk/debathena/config/gdm-config/debian/changelog
> trunk/debathena/config/gdm-config/debian/debathena-nologin-monitor
> Log:
> In gdm-config:
> * Monitor the real file, not a symlink target
>
>
> Modified: trunk/debathena/config/gdm-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/gdm-config/debian/changelog 2011-03-02 16:48:36 UTC (rev 24994)
> +++ trunk/debathena/config/gdm-config/debian/changelog 2011-03-02 19:02:13 UTC (rev 24995)
> @@ -1,8 +1,9 @@
> -debathena-gdm-config (1.24.1) unstable; urgency=low
> +debathena-gdm-config (1.25) unstable; urgency=low
>
> * Applets shouldn't attempt to steal focus
> + * Monitor the real file, not a symlink target
>
> - -- Jonathan Reed <jdreed@mit.edu> Wed, 23 Feb 2011 20:47:53 -0500
> + -- Jonathan Reed <jdreed@mit.edu> Wed, 02 Mar 2011 14:02:07 -0500
>
> debathena-gdm-config (1.24) unstable; urgency=low
>
>
> Modified: trunk/debathena/config/gdm-config/debian/debathena-nologin-monitor
> ===================================================================
> --- trunk/debathena/config/gdm-config/debian/debathena-nologin-monitor 2011-03-02 16:48:36 UTC (rev 24994)
> +++ trunk/debathena/config/gdm-config/debian/debathena-nologin-monitor 2011-03-02 19:02:13 UTC (rev 24995)
> @@ -9,6 +9,7 @@
> import gobject
> import sys
> import os
> +import subprocess
>
> SM_DBUS_NAME = "org.gnome.SessionManager"
> SM_DBUS_PATH = "/org/gnome/SessionManager"
> @@ -28,16 +29,26 @@
>
> self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
> self.window.set_property('can-focus', False)
> + box = gtk.VBox()
> self.label = gtk.Label()
> - self.label.set_markup('<span font_desc="Sans Bold 24">This workstation is temporarily unavailable. Please use another workstation.</span>')
> + self.label.set_markup('<span font_desc="Sans Bold 24">Software updates are being applied.\n\nThis workstation is temporarily unavailable.\n\nPlease use another workstation.</span>')
> self.label.set_property('can-focus', False)
> - self.window.add(self.label)
> + self.label.set_justify(gtk.JUSTIFY_CENTER)
> + box.pack_start(self.label, True, True, 5)
> + self.window.add(box)
> + self.window.set_size_request(800, 600)
> self.window.set_decorated(False)
> self.window.set_position(gtk.WIN_POS_CENTER)
> self.window.hide()
> - self.gfile = gio.File("/etc/nologin")
> - self.monitor = self.gfile.monitor_file(gio.FILE_MONITOR_NONE, None)
> - self.monitor.connect("changed", self.directory_changed)
> + try:
> + metapackage = subprocess.Popen(["machtype", "-L"], stdout=subprocess.PIPE).communicate()[0].rstrip()
> + except OSError:
> + # Assume cluster
> + metapackage = 'debathena-cluster'
> + if metapackage == 'debathena-cluster':
> + self.gfile = gio.File("/var/run/athena-nologin")
> + self.monitor = self.gfile.monitor_file(gio.FILE_MONITOR_NONE, None)
> + self.monitor.connect("changed", self.directory_changed)
>
> def directory_changed(self, monitor, file1, file2, evt_type):
> # type(evt_type) is <class 'gio._gio.FileMonitorEvent'>
>
