extras-buildsys/client client.py,1.25,1.26

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17109/client

Modified Files:
	client.py 
Log Message:
2005-08-07  Dan Williams <dcbw at redhat.com>

    Play nicely when running more than one builder instance on the same
    machine.

    * builder/builder.py
        - Try to delete actual mock work dir rather than just the buildroot

    * client/client.py
        - Prettier printing of job detail command output
        - Show builder port numbers

    * server/ArchJob.py
        - Save builder port number

    * server/BuildMaster.py
        - Add a builder port # to the archjobs table, and save builder port #
            when writing archjob status to the DB

    * server/Builder.py
        - (to_dict): return builder port # too

    * server/BuilderManager.py
        - Don't exit when adding new builders that have wrong connection
            protocol, just ignore them

    * server/UserInterface.py
        - Retrieve and return builder port numbers too

    * www/builders.psp
        - Differentiate builders and their jobs by port #
        - Only show building archjobs, not 'downloading' or 'downloaded' ones

    * www/job.psp
        - Show builder port numbers




Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- client.py	6 Aug 2005 02:35:06 -0000	1.25
+++ client.py	8 Aug 2005 02:54:15 -0000	1.26
@@ -173,9 +173,20 @@
         return
     if err == -1:
         print msg
-    else:
-        print jobrec
+        return
 
+    print "\nDetail for Job ID %d (%s):" % (int(jobrec['uid']), jobrec['package'])
+    print "-" * 80
+    print "Source: %s" % jobrec['source']
+    print "Target: %s" % jobrec['target']
+    print "Submitter: %s" % jobrec['username']
+    print "Status: %s/%s" % (jobrec['status'], jobrec['result'])
+
+    print "Archjobs:"
+    for aj in jobrec['archjobs']:
+        print "    %s: %s    %s/%s" % (aj['arch'], aj['builder_addr'], aj['status'], aj['builder_status'])
+
+    print ""
 
 def kill(server, email, jobid):
     """
@@ -195,8 +206,9 @@
         print "\nBuilders:"
         print "-" * 90
         for builder in builder_list:
-            string = "  " + builder['address']
-            string = string + " " * (40 - len(builder['address']))
+            builder_addr = builder['address'] + ":" + builder['port']
+            string = "  " + builder_addr
+            string = string + " " * (40 - len(builder_addr))
             for arch in builder['arches']:
                 string = string + arch + " "
             string = string + "    " + builder['status']
@@ -362,6 +374,9 @@
         sys.exit(1)
 
     if cmd == 'build':
+        if len(sys.argv) < 5:
+            Usage()
+            exit(1)
         item = sys.argv[3]
         try:
             if item.endswith(".src.rpm") and os.path.exists(item):