[Buildbot-commits] buildbot/buildbot/scripts runner.py,1.11,1.12

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32571/buildbot/scripts

Modified Files:
	runner.py 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-75
Creator:  Brian Warner <warner at monolith.lothar.com>

make 'buildbot statusgui' work again, at least somewhat

2005-04-23  Brian Warner  <warner at lothar.com>

   * buildbot/scripts/runner.py: make 'statuslog' and 'statusgui' be
   the sub-commands that log buildmaster status to stdout and to a
   GUI window, respectively.

   * buildbot/clients/gtkPanes.py: overhaul. basic two-row
   functionality is working again, but all the step-status and ETA
   stuff is missing. Commented out a lot of code pending more
   overhaul work.

   * buildbot/status/client.py: make sure that IRemote(None) is None


Index: runner.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/runner.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- runner.py	23 Apr 2005 00:01:21 -0000	1.11
+++ runner.py	23 Apr 2005 10:37:00 -0000	1.12
@@ -211,7 +211,7 @@
     d = debug.DebugWidget(config['master'], config['passwd'])
     d.run()
 
-class StatusGuiClientOptions(usage.Options):
+class StatusClientOptions(usage.Options):
     optFlags = [
         ['help', 'h', "Display this message"],
         ]
@@ -226,13 +226,16 @@
         if len(args) > 1:
             raise usage.UsageError("I wasn't expecting so many arguments")
 
-def statusgui(config):
-    #from buildbot.clients import gtkPanes
-    #c = gtkPanes.GtkClient(config['master'])
+def statuslog(config):
     from buildbot.clients import base
     c = base.TextClient(config['master'])
     c.run()
 
+def statusgui(config):
+    from buildbot.clients import gtkPanes
+    c = gtkPanes.GtkClient(config['master'])
+    c.run()
+
 class Options(usage.Options):
     synopsis = "Usage:    buildbot <command> [command options]"
 
@@ -250,7 +253,9 @@
         ['debugclient', None, DebugClientOptions,
          "Launch a small debug panel GUI"],
 
-        ['status_gui', None, StatusGuiClientOptions,
+        ['statuslog', None, StatusClientOptions,
+         "Emit current builder status to stdout"],
+        ['statusgui', None, StatusClientOptions,
          "Display a small window showing current builder status"],
 
         # TODO: 'try', 'watch'
@@ -287,5 +292,7 @@
         stop(so, "-HUP")
     elif command == "debugclient":
         debugclient(so)
-    elif command == "status_gui":
+    elif command == "statuslog":
+        statuslog(so)
+    elif command == "statusgui":
         statusgui(so)