[26402] in Source-Commits
/svn/athena r25552 - in trunk/debathena/debathena/moira-gui: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sun Jun 3 12:28:25 2012
Date: Sun, 3 Jun 2012 12:28:24 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206031628.q53GSO6K017717@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 12:28:23 -0400 (Sun, 03 Jun 2012)
New Revision: 25552
Modified:
trunk/debathena/debathena/moira-gui/debian/changelog
trunk/debathena/debathena/moira-gui/xmoira
Log:
In moira-gui:
* Fail if we can't auth to moira.
Modified: trunk/debathena/debathena/moira-gui/debian/changelog
===================================================================
--- trunk/debathena/debathena/moira-gui/debian/changelog 2012-06-03 15:26:35 UTC (rev 25551)
+++ trunk/debathena/debathena/moira-gui/debian/changelog 2012-06-03 16:28:23 UTC (rev 25552)
@@ -1,3 +1,9 @@
+debathena-moira-gui (1.3) unstable; urgency=low
+
+ * Fail if we can't auth to moira.
+
+ -- Jonathan Reed <jdreed@mit.edu> Sun, 03 Jun 2012 12:27:27 -0400
+
debathena-moira-gui (1.2) unstable; urgency=low
* Pre-populate the chpobox widgets to match the user's current
Modified: trunk/debathena/debathena/moira-gui/xmoira
===================================================================
--- trunk/debathena/debathena/moira-gui/xmoira 2012-06-03 15:26:35 UTC (rev 25551)
+++ trunk/debathena/debathena/moira-gui/xmoira 2012-06-03 16:28:23 UTC (rev 25552)
@@ -20,6 +20,7 @@
class XMoira():
def __init__(self):
+ self.running=False
self.widgets = gtk.glade.XML(gladeFile)
self.window = self.widgets.get_widget("mainWindow")
self.widgets.signal_autoconnect(self)
@@ -157,7 +158,14 @@
if self.connected:
return
moira.connect()
- moira.auth(self.clientName)
+ try:
+ moira.auth(self.clientName)
+ except moira.MoiraException, e:
+ self.errorDialog("Unable to authenticate to Moira: %s" % (e.args[1]), True)
+ if self.running:
+ self.quit()
+ else:
+ sys.exit(255)
self.connected = True
def query(self, query, *argList):
@@ -177,6 +185,7 @@
def run(self):
+ self.running=True
gtk.main()
def quit(self, widget=None, event=None):
