[26408] in Source-Commits
/svn/athena r25553 - in trunk/debathena/debathena/kiosk: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sun Jun 3 14:26:52 2012
Date: Sun, 3 Jun 2012 14:26:50 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206031826.q53IQoIY009183@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-06-03 14:26:50 -0400 (Sun, 03 Jun 2012)
New Revision: 25553
Modified:
trunk/debathena/debathena/kiosk/debian/changelog
trunk/debathena/debathena/kiosk/gdm-launch-kiosk
Log:
In kiosk:
* Don't launch the kiosk mode if an update is in progress (Trac: #1006)
Modified: trunk/debathena/debathena/kiosk/debian/changelog
===================================================================
--- trunk/debathena/debathena/kiosk/debian/changelog 2012-06-03 16:28:23 UTC (rev 25552)
+++ trunk/debathena/debathena/kiosk/debian/changelog 2012-06-03 18:26:50 UTC (rev 25553)
@@ -5,8 +5,9 @@
switch to Chrome
* Add a gconf-tree.xml to prevent [redacted] (Trac: 1130)
* Tweak wording on home page.
+ * Don't launch the kiosk mode if an update is in progress (Trac: #1006)
- -- Jonathan Reed <jdreed@mit.edu> Fri, 01 Jun 2012 13:25:54 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Sun, 03 Jun 2012 14:26:05 -0400
debathena-kiosk (1.4.4) unstable; urgency=low
Modified: trunk/debathena/debathena/kiosk/gdm-launch-kiosk
===================================================================
--- trunk/debathena/debathena/kiosk/gdm-launch-kiosk 2012-06-03 16:28:23 UTC (rev 25552)
+++ trunk/debathena/debathena/kiosk/gdm-launch-kiosk 2012-06-03 18:26:50 UTC (rev 25553)
@@ -52,7 +52,16 @@
def kioskButton_on_click(self, button):
if not self.sessionEnding:
- self.kioskDialog.run()
+ if os.path.exists("/var/run/athena-nologin"):
+ errDlg = gtk.MessageDialog(None,
+ gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+ gtk.MESSAGE_ERROR,
+ gtk.BUTTONS_CLOSE,
+ "This machine is currently taking an update and the kiosk browser can't be launched. Please try again later.")
+ errDlg.run()
+ errDlg.destroy()
+ else:
+ self.kioskDialog.run()
def kioskDialogResponseHandler(self, dialog, response_id):
if response_id == 1 and not self.sessionEnding:
