[26041] in Source-Commits
Re: /svn/athena r25358 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Thu Aug 4 11:39:29 2011
Date: Thu, 4 Aug 2011 11:39:22 -0400 (EDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Jonathan D Reed <jdreed@mit.edu>
cc: source-commits@mit.edu
In-Reply-To: <201108041538.p74FcCZ3003133@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1108041139220.21363@tyger.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK
--
Geoffrey Thomas
geofft@mit.edu
On Thu, 4 Aug 2011, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2011-08-04 11:38:12 -0400 (Thu, 04 Aug 2011)
> New Revision: 25358
>
> Modified:
> trunk/debathena/config/gdm-config/debian/changelog
> trunk/debathena/config/gdm-config/debian/debathena-nologin-monitor
> Log:
> In gdm-config:
> * Only display the nologin-monitor window on startup if the file exists
> AND this is -cluster
> * Include a timestamp in the window
>
>
> Modified: trunk/debathena/config/gdm-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/gdm-config/debian/changelog 2011-08-04 03:13:36 UTC (rev 25357)
> +++ trunk/debathena/config/gdm-config/debian/changelog 2011-08-04 15:38:12 UTC (rev 25358)
> @@ -1,3 +1,11 @@
> +debathena-gdm-config (1.31) unstable; urgency=low
> +
> + * Only display the nologin-monitor window on startup if the file exists
> + AND this is -cluster
> + * Include a timestamp in the window
> +
> + -- Jonathan Reed <jdreed@mit.edu> Thu, 04 Aug 2011 11:36:58 -0400
> +
> debathena-gdm-config (1.30) unstable; urgency=low
>
> * Display the nologin-monitor window if the file exists when we start up
>
> Modified: trunk/debathena/config/gdm-config/debian/debathena-nologin-monitor
> ===================================================================
> --- trunk/debathena/config/gdm-config/debian/debathena-nologin-monitor 2011-08-04 03:13:36 UTC (rev 25357)
> +++ trunk/debathena/config/gdm-config/debian/debathena-nologin-monitor 2011-08-04 15:38:12 UTC (rev 25358)
> @@ -10,6 +10,7 @@
> import sys
> import os
> import subprocess
> +import time
> from optparse import OptionParser
>
> SM_DBUS_NAME = "org.gnome.SessionManager"
> @@ -34,7 +35,7 @@
> self.window.set_property('can-focus', False)
> box = gtk.VBox()
> self.label = gtk.Label()
> - 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_markup('<span font_desc="Sans Bold 24">Software updates are being applied.\n\nThis workstation is temporarily unavailable.\n\nPlease use another workstation.\n\n</span>(Update started at %s)' % (time.strftime("%Y-%m-%d %H:%M")))
> self.label.set_property('can-focus', False)
> self.label.set_justify(gtk.JUSTIFY_CENTER)
> box.pack_start(self.label, True, True, 5)
> @@ -50,7 +51,7 @@
> except OSError:
> # Assume cluster
> metapackage = 'debathena-cluster'
> - if os.path.isfile("/var/run/athena-nologin"):
> + if (self.debug or metapackage == 'debathena-cluster') and os.path.isfile("/var/run/athena-nologin"):
> self.window.show_all()
> if self.debug or metapackage == 'debathena-cluster':
> self.gfile = gio.File("/var/run/athena-nologin")
> @@ -61,6 +62,7 @@
> if self.debug:
> print str(evt_type), file1.get_path()
> if evt_type == gio.FILE_MONITOR_EVENT_CREATED:
> + 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.\n\n</span>(Update started at %s)' % (time.strftime("%Y-%m-%d %H:%M")))
> self.window.show_all()
> if evt_type == gio.FILE_MONITOR_EVENT_DELETED:
> self.window.hide()
>
>
